refactor to remove brave/browser and chrome/browser dependencies outs…

…ide of ViewCounterServiceFactory
brave · Jan 27, 2020 · 278fb27 · 278fb27
1 parent 5cad9f5
commit 278fb27
Show file tree

Hide file tree

Showing 46 changed files with 772 additions and 654 deletions.
diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc
@@ -20,6 +20,7 @@
 #include "brave/browser/tor/buildflags.h"
 #include "brave/browser/ui/brave_browser_command_controller.h"
 #include "brave/common/pref_names.h"
+#include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h"
 #include "brave/components/brave_component_updater/browser/local_data_files_service.h"
 #include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service_manager.h"
@@ -34,6 +35,7 @@
 #include "brave/components/p3a/brave_p3a_service.h"
 #include "brave/services/network/public/cpp/system_request_handler.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/webui/components_ui.h"
 #include "chrome/common/buildflags.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/component_updater/component_updater_service.h"
@@ -75,6 +77,8 @@
 #include "chrome/browser/ui/browser.h"
 #endif
 
+using ntp_sponsored_images::NTPSponsoredImagesService;
+
 namespace {
 
 // Initializes callback for SystemRequestHandler
@@ -128,6 +132,9 @@ BraveBrowserProcessImpl::BraveBrowserProcessImpl(StartupData* startup_data)
 void BraveBrowserProcessImpl::Init() {
   BrowserProcessImpl::Init();
 
+  brave_component_updater::BraveOnDemandUpdater::GetInstance()->
+      RegisterOnDemandUpdateCallback(
+          base::BindRepeating(&ComponentsUI::OnDemandUpdate));
   UpdateBraveDarkMode();
   pref_change_registrar_.Add(
       kBraveDarkMode,

diff --git a/browser/brave_browser_process_impl.h b/browser/brave_browser_process_impl.h
@@ -44,19 +44,22 @@ class ReferrerWhitelistService;
 class TrackingProtectionService;
 }  // namespace brave_shields
 
-class NTPSponsoredImagesService;
-
 namespace greaselion {
 #if BUILDFLAG(ENABLE_GREASELION)
 class GreaselionDownloadService;
 #endif
 }  // namespace greaselion
 
+namespace ntp_sponsored_images {
+class NTPSponsoredImagesService;
+}  // namespace ntp_sponsored_images
+
 namespace extensions {
 class BraveTorClientUpdater;
 }
 
 using brave_component_updater::BraveComponent;
+using ntp_sponsored_images::NTPSponsoredImagesService;
 
 class BraveBrowserProcessImpl : public BrowserProcessImpl {
  public:

diff --git a/browser/browser_context_keyed_service_factories.cc b/browser/browser_context_keyed_service_factories.cc
@@ -12,7 +12,7 @@
 #include "brave/components/brave_ads/browser/ads_service_factory.h"
 #include "brave/components/brave_rewards/browser/rewards_service_factory.h"
 #include "brave/components/greaselion/browser/buildflags/buildflags.h"
-#include "brave/browser/ntp_sponsored_images/new_tab_page_branded_view_counter.h"
+#include "brave/browser/ntp_sponsored_images/view_counter_service_factory.h"
 
 #if BUILDFLAG(ENABLE_GREASELION)
 #include "brave/browser/greaselion/greaselion_service_factory.h"
@@ -34,8 +34,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #endif
   TorProfileServiceFactory::GetInstance();
   SearchEngineProviderServiceFactory::GetInstance();
-  NewTabPageBrandedViewCounter::
-      EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  ntp_sponsored_images::ViewCounterServiceFactory::GetInstance();
 
 #if !defined(OS_ANDROID)
   BookmarkPrefsServiceFactory::GetInstance();

diff --git a/browser/component_updater/brave_component_updater_delegate.cc b/browser/component_updater/brave_component_updater_delegate.cc
@@ -10,11 +10,12 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task/post_task.h"
 #include "brave/browser/component_updater/brave_component_installer.h"
-#include "chrome/browser/ui/webui/components_ui.h"
+#include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h"
 #include "chrome/browser/browser_process.h"
 #include "components/component_updater/component_updater_service.h"
 
 using brave_component_updater::BraveComponent;
+using brave_component_updater::BraveOnDemandUpdater;
 
 namespace brave {
 
@@ -46,7 +47,7 @@ bool BraveComponentUpdaterDelegate::Unregister(
 
 void BraveComponentUpdaterDelegate::OnDemandUpdate(
     const std::string& component_id) {
-  ComponentsUI::OnDemandUpdate(component_id);
+  BraveOnDemandUpdater::GetInstance()->OnDemandUpdate(component_id);
 }
 
 scoped_refptr<base::SequencedTaskRunner>

diff --git a/browser/ntp_sponsored_images/BUILD.gn b/browser/ntp_sponsored_images/BUILD.gn
@@ -1,20 +1,18 @@
 source_set("ntp_sponsored_images") {
   sources = [
-    "new_tab_page_branded_view_counter.cc",
-    "new_tab_page_branded_view_counter.h",
-    "view_counter_model.cc",
-    "view_counter_model.h",
+    "view_counter_service_factory.cc",
+    "view_counter_service_factory.h",
   ]
 
   deps = [
     "//base",
-    "//components/keyed_service/core",
-    "//components/prefs",
-    "//components/pref_registry",
-    "//brave/components/brave_rewards/browser",
     "//brave/components/ntp_sponsored_images/browser",
     "//brave/common",
+    "//brave/components/brave_ads/browser",
     "//chrome/common",
     "//content/public/browser",
+    "//components/keyed_service/content",
+    "//components/prefs",
+    "//components/pref_registry",
   ]
 }
diff --git a/browser/ntp_sponsored_images/new_tab_page_branded_view_counter.cc b/browser/ntp_sponsored_images/new_tab_page_branded_view_counter.cc