chore: no need to explicitly create dir

electron · Apr 14, 2022 · 585ef03 · 585ef03
1 parent 7c3bdf2
commit 585ef03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
@@ -139,13 +139,9 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       cur = cur.Append(base::FilePath::FromUTF8Unsafe("Dictionaries"));
       create_dir = true;
       break;
-    case DIR_BROWSER_DATA: {
+    case DIR_BROWSER_DATA:
       // By default and for backward, equivalent to DIR_USER_DATA.
-      if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
-        return false;
-      create_dir = true;
-      break;
-    }
+      return base::PathService::Get(chrome::DIR_USER_DATA, result);
     case DIR_USER_CACHE: {
 #if BUILDFLAG(IS_POSIX)
       int parent_key = base::DIR_CACHE;

diff --git a/shell/browser/browser.cc b/shell/browser/browser.cc
@@ -190,9 +190,6 @@ void Browser::DidFinishLaunching(base::DictionaryValue launch_info) {
   base::FilePath user_data;
   if (base::PathService::Get(chrome::DIR_USER_DATA, &user_data))
     base::CreateDirectoryAndGetError(user_data, nullptr);
-  base::FilePath browser_data;
-  if (base::PathService::Get(DIR_BROWSER_DATA, &browser_data))
-    base::CreateDirectoryAndGetError(browser_data, nullptr);
 
   is_ready_ = true;
   if (ready_promise_) {

diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
@@ -1139,11 +1139,11 @@ void ElectronBrowserClient::OnNetworkServiceCreated(
 
 std::vector<base::FilePath>
 ElectronBrowserClient::GetNetworkContextsParentDirectory() {
-  base::FilePath user_data_dir;
-  base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  DCHECK(!user_data_dir.empty());
+  base::FilePath browser_data;
+  base::PathService::Get(DIR_BROWSER_DATA, &browser_data);
+  DCHECK(!browser_data.empty());
 
-  return {user_data_dir};
+  return {browser_data};
 }
 
 std::string ElectronBrowserClient::GetProduct() {