added ipfs common header

Signed-off-by: Vadym Struts <vstruts@brave.com>
brave · Sep 5, 2024 · 61ed0ff · 61ed0ff
1 parent da21ed0
commit 61ed0ff
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 32 deletions.
diff --git a/browser/brave_browser_main_parts.cc b/browser/brave_browser_main_parts.cc
@@ -69,7 +69,6 @@
 
 #if !BUILDFLAG(IS_ANDROID)
 #include "base/path_service.h"
-#include "brave/browser/ipfs/ipfs_common.h"
 #include "brave/components/ipfs/ipfs_component_cleaner.h"
 #include "chrome/common/chrome_paths.h"
 #endif  // !BUILDFLAG(IS_ANDROID)
@@ -169,8 +168,7 @@ void BraveBrowserMainParts::PostBrowserStart() {
 
 #if !BUILDFLAG(IS_ANDROID)
   ipfs::CleanupIpfsComponent(
-      base::PathService::CheckedGet(chrome::DIR_USER_DATA)
-          .Append(kIpfsClientComponentId));
+      base::PathService::CheckedGet(chrome::DIR_USER_DATA));
 #endif  // !BUILDFLAG(IS_ANDROID)
 }
 

diff --git a/browser/ipfs/sources.gni b/browser/ipfs/sources.gni
diff --git a/browser/sources.gni b/browser/sources.gni
@@ -25,7 +25,6 @@ import("//brave/browser/gcm_driver/sources.gni")
 import("//brave/browser/greaselion/sources.gni")
 import("//brave/browser/importer/sources.gni")
 import("//brave/browser/infobars/sources.gni")
-import("//brave/browser/ipfs/sources.gni")
 import("//brave/browser/misc_metrics/sources.gni")
 import("//brave/browser/net/sources.gni")
 import("//brave/browser/new_tab/sources.gni")
@@ -501,7 +500,6 @@ brave_chrome_browser_sources += brave_browser_themes_sources
 brave_chrome_browser_sources += brave_browser_tor_sources
 brave_chrome_browser_sources += brave_browser_url_sanitizer_sources
 brave_chrome_browser_sources += brave_browser_web_discovery_sources
-brave_chrome_browser_sources += brave_browser_ipfs_sources
 
 brave_chrome_browser_deps += brave_browser_autocomplete_deps
 brave_chrome_browser_deps += brave_browser_brave_adaptive_captcha_deps
@@ -541,6 +539,5 @@ brave_chrome_browser_deps += brave_browser_url_sanitizer_deps
 brave_chrome_browser_deps += brave_browser_web_discovery_deps
 brave_chrome_browser_deps += brave_chromium_src_chrome_browser_deps
 brave_chrome_browser_deps += brave_chromium_src_chrome_browser_prefs_deps
-brave_chrome_browser_deps += brave_browser_ipfs_deps
 
 brave_chrome_browser_allow_circular_includes_from = [ "//brave/browser/ui" ]
diff --git a/components/ipfs/BUILD.gn b/components/ipfs/BUILD.gn
@@ -22,6 +22,7 @@ static_library("ipfs") {
 
   if (!is_android) {
     sources += [
+      "ipfs_common.h",
       "ipfs_component_cleaner.cc",
       "ipfs_component_cleaner.h",
     ]

diff --git a/browser/ipfs/ipfs_common.h → components/ipfs/ipfs_common.h b/browser/ipfs/ipfs_common.h → components/ipfs/ipfs_common.h
@@ -3,8 +3,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#ifndef BRAVE_BROWSER_IPFS_IPFS_COMMON_H_
-#define BRAVE_BROWSER_IPFS_IPFS_COMMON_H_
+#ifndef BRAVE_COMPONENTS_IPFS_IPFS_COMMON_H_
+#define BRAVE_COMPONENTS_IPFS_IPFS_COMMON_H_
 
 #include "base/files/file_path.h"
 #include "build/build_config.h"
@@ -30,4 +30,4 @@ static const base::FilePath::StringPieceType kIpfsClientComponentId =
 #endif
 #endif
 
-#endif  // BRAVE_BROWSER_IPFS_IPFS_COMMON_H_
+#endif  // BRAVE_COMPONENTS_IPFS_IPFS_COMMON_H_
diff --git a/components/ipfs/ipfs_component_cleaner.cc b/components/ipfs/ipfs_component_cleaner.cc
@@ -8,13 +8,15 @@
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/task/thread_pool.h"
+#include "brave/components/ipfs/ipfs_common.h"
 #include "build/build_config.h"
 
 namespace ipfs {
-void CleanupIpfsComponent(const base::FilePath& component_path) {
+void CleanupIpfsComponent(const base::FilePath& user_data_dir) {
   // Remove IPFS component
   base::ThreadPool::PostTask(
       FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()},
-      base::GetDeletePathRecursivelyCallback(component_path));
+      base::GetDeletePathRecursivelyCallback(
+          user_data_dir.Append(kIpfsClientComponentId)));
 }
 }  // namespace ipfs
diff --git a/components/ipfs/ipfs_component_cleaner.h b/components/ipfs/ipfs_component_cleaner.h
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 
 namespace ipfs {
-void CleanupIpfsComponent(const base::FilePath& component_path);
+void CleanupIpfsComponent(const base::FilePath& user_data_dir);
 }  // namespace ipfs
 
 #endif  // BRAVE_COMPONENTS_IPFS_IPFS_COMPONENT_CLEANER_H_
diff --git a/components/ipfs/ipfs_component_cleaner_unittest.cc b/components/ipfs/ipfs_component_cleaner_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
-#include "brave/browser/ipfs/ipfs_common.h"
+#include "brave/components/ipfs/ipfs_common.h"
 #include "build/build_config.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/chrome_paths.h"
@@ -68,8 +68,7 @@ TEST_F(IpfsComponentCleanerUnitTest, CleanIpfsComponent) {
   base::WriteFile(component_id_folde_subdir_file_01, "12345678901234567890");
 
   ipfs::CleanupIpfsComponent(
-      base::PathService::CheckedGet(chrome::DIR_USER_DATA)
-          .Append(kIpfsClientComponentId));
+      base::PathService::CheckedGet(chrome::DIR_USER_DATA));
   task_environment_.RunUntilIdle();
   EXPECT_TRUE(base::PathExists(cache_folder));
   EXPECT_FALSE(base::PathExists(component_id_folder));