[iOS] Factor UrlLoadingNotifier into a BrowserAgent

Changes the URL loading notifier keyed service into a browser agent.

This removes the notifier service as a direct dependency on the URL
loading service; instead the loading service fetches the notifier
when it is assigned a Browser.

Bug: 1046375
Change-Id: I302858f854d310749660922c994ae8b9238a24b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093441
Commit-Queue: Mark Cogan <marq@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749657}

ios/chrome/browser/main/BUILD.gn

@@ -52,6 +52,7 @@ source_set("main") {
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",

ios/chrome/browser/main/browser_agent_util.mm

@@ -14,6 +14,7 @@
 #import "ios/chrome/browser/sessions/session_restoration_browser_agent.h"
 #import "ios/chrome/browser/sessions/session_service_ios.h"
 #include "ios/chrome/browser/tabs/synced_window_delegate_browser_agent.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 #import "ios/chrome/browser/web_state_list/tab_insertion_browser_agent.h"
 #import "ios/chrome/browser/web_state_list/web_usage_enabler/web_usage_enabler_browser_agent.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
@@ -31,6 +32,7 @@ void AttachBrowserAgents(Browser* browser) {
   AttachInfobarOverlayBrowserAgent(browser);
   SyncedWindowDelegateBrowserAgent::CreateForBrowser(browser);
   WebUsageEnablerBrowserAgent::CreateForBrowser(browser);
+  UrlLoadingNotifierBrowserAgent::CreateForBrowser(browser);
 
   // SessionRestorartionAgent requires WebUsageEnablerBrowserAgent.
   SessionRestorationBrowserAgent::CreateForBrowser(

ios/chrome/browser/ui/browser_view/BUILD.gn

@@ -232,6 +232,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading:url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",

ios/chrome/browser/ui/browser_view/browser_coordinator_unittest.mm

@@ -12,6 +12,7 @@
 #import "ios/chrome/browser/ui/commands/browser_coordinator_commands.h"
 #import "ios/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/chrome/browser/ui/download/features.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 #include "ios/web/public/test/web_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
@@ -27,17 +28,20 @@
 class BrowserCoordinatorTest : public PlatformTest {
  protected:
   BrowserCoordinatorTest()
-      : base_view_controller_([[UIViewController alloc] init]) {}
+      : base_view_controller_([[UIViewController alloc] init]),
+        browser_(std::make_unique<TestBrowser>()) {
+    UrlLoadingNotifierBrowserAgent::CreateForBrowser(browser_.get());
+  }
 
   BrowserCoordinator* GetBrowserCoordinator() {
     return [[BrowserCoordinator alloc]
         initWithBaseViewController:base_view_controller_
-                           browser:&browser_];
+                           browser:browser_.get()];
   }
 
   web::WebTaskEnvironment task_environment_;
   UIViewController* base_view_controller_;
-  TestBrowser browser_;
+  std::unique_ptr<TestBrowser> browser_;
 };
 
 // Tests if the URL to open the downlads directory from files.app is valid.
@@ -64,7 +68,7 @@ TEST_F(BrowserCoordinatorTest, ShowDownloadsFolder) {
 
   [browser_coordinator start];
 
-  CommandDispatcher* dispatcher = browser_.GetCommandDispatcher();
+  CommandDispatcher* dispatcher = browser_->GetCommandDispatcher();
   id<BrowserCoordinatorCommands> handler =
       HandlerForProtocol(dispatcher, BrowserCoordinatorCommands);
   [handler showDownloadsFolder];

ios/chrome/browser/ui/browser_view/browser_view_controller.mm

@@ -150,8 +150,7 @@
 #import "ios/chrome/browser/ui/voice/text_to_speech_playback_controller_factory.h"
 #include "ios/chrome/browser/upgrade/upgrade_center.h"
 #import "ios/chrome/browser/url_loading/image_search_param_generator.h"
-#import "ios/chrome/browser/url_loading/url_loading_notifier.h"
-#import "ios/chrome/browser/url_loading/url_loading_notifier_factory.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 #import "ios/chrome/browser/url_loading/url_loading_observer_bridge.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
 #import "ios/chrome/browser/url_loading/url_loading_service.h"
@@ -1357,10 +1356,10 @@ NSString* const kBrowserViewControllerSnackbarCategory =
     if (controller)
       controller->SetWebStateList(nullptr);
 
-    UrlLoadingNotifier* urlLoadingNotifier =
-        UrlLoadingNotifierFactory::GetForBrowserState(self.browserState);
-    if (urlLoadingNotifier)
-      urlLoadingNotifier->RemoveObserver(_URLLoadingObserverBridge.get());
+    UrlLoadingNotifierBrowserAgent* notifier =
+        UrlLoadingNotifierBrowserAgent::FromBrowser(self.browser);
+    if (notifier)
+      notifier->RemoveObserver(_URLLoadingObserverBridge.get());
   }
 
   // Uninstall delegates so that any delegate callbacks triggered by subsequent
@@ -1870,9 +1869,8 @@ NSString* const kBrowserViewControllerSnackbarCategory =
   _webStateListObserver = std::make_unique<WebStateListObserverBridge>(self);
   self.browser->GetWebStateList()->AddObserver(_webStateListObserver.get());
   _URLLoadingObserverBridge = std::make_unique<UrlLoadingObserverBridge>(self);
-  UrlLoadingNotifier* urlLoadingNotifier =
-      UrlLoadingNotifierFactory::GetForBrowserState(self.browserState);
-  urlLoadingNotifier->AddObserver(_URLLoadingObserverBridge.get());
+  UrlLoadingNotifierBrowserAgent::FromBrowser(self.browser)
+      ->AddObserver(_URLLoadingObserverBridge.get());
 
   WebStateList* webStateList = self.browser->GetWebStateList();
   for (int index = 0; index < webStateList->count(); ++index)

ios/chrome/browser/ui/browser_view/browser_view_controller_unittest.mm

@@ -32,6 +32,7 @@
 #import "ios/chrome/browser/ui/commands/page_info_commands.h"
 #import "ios/chrome/browser/ui/commands/text_zoom_commands.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 #include "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
 #include "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
@@ -105,6 +106,7 @@ class BrowserViewControllerTest : public BlockCleanupTest {
 
     browser_ = std::make_unique<TestBrowser>(chrome_browser_state_.get());
     WebUsageEnablerBrowserAgent::CreateForBrowser(browser_.get());
+    UrlLoadingNotifierBrowserAgent::CreateForBrowser(browser_.get());
     WebUsageEnablerBrowserAgent::FromBrowser(browser_.get())
         ->SetWebUsageEnabled(true);
 

ios/chrome/browser/url_loading/BUILD.gn

@@ -13,10 +13,8 @@ source_set("url_loading") {
     "test_app_url_loading_service.mm",
     "test_url_loading_service.h",
     "test_url_loading_service.mm",
-    "url_loading_notifier.h",
-    "url_loading_notifier.mm",
-    "url_loading_notifier_factory.cc",
-    "url_loading_notifier_factory.h",
+    "url_loading_notifier_browser_agent.h",
+    "url_loading_notifier_browser_agent.mm",
     "url_loading_observer_bridge.h",
     "url_loading_observer_bridge.mm",
     "url_loading_params.h",
@@ -37,7 +35,7 @@ source_set("url_loading") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/feature_engagement",
-    "//ios/chrome/browser/main",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/snapshots",

ios/chrome/browser/url_loading/test_url_loading_service.h

@@ -10,7 +10,7 @@
 
 class TestUrlLoadingService : public UrlLoadingService {
  public:
-  TestUrlLoadingService(UrlLoadingNotifier* notifier);
+  TestUrlLoadingService();
 
   // These are the last parameters passed to |OpenUrl|.
   UrlLoadParams last_params;

ios/chrome/browser/url_loading/test_url_loading_service.mm

@@ -5,14 +5,13 @@
 #import "ios/chrome/browser/url_loading/test_url_loading_service.h"
 
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
-#import "ios/chrome/browser/url_loading/url_loading_notifier.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-TestUrlLoadingService::TestUrlLoadingService(UrlLoadingNotifier* notifier)
-    : UrlLoadingService(notifier) {}
+TestUrlLoadingService::TestUrlLoadingService() {}
 
 void TestUrlLoadingService::LoadUrlInCurrentTab(const UrlLoadParams& params) {
   last_params = params;

ios/chrome/browser/url_loading/url_loading_notifier.h → ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h

@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_H_
-#define IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_H_
+#ifndef IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_BROWSER_AGENT_H_
+#define IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_BROWSER_AGENT_H_
 
-#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
-#include "components/keyed_service/core/keyed_service.h"
+#include "ios/chrome/browser/main/browser_user_data.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
@@ -16,11 +14,15 @@ class UrlLoadingObserverBridge;
 
 // A class containing static functions to notify observers of url loading
 // state change.
-class UrlLoadingNotifier : public KeyedService {
+class UrlLoadingNotifierBrowserAgent
+    : public BrowserUserData<UrlLoadingNotifierBrowserAgent> {
  public:
-  // Creates a UrlLoadingNotifier.
-  explicit UrlLoadingNotifier();
-  ~UrlLoadingNotifier() override;
+  // Not copyable or moveable
+  UrlLoadingNotifierBrowserAgent(const UrlLoadingNotifierBrowserAgent&) =
+      delete;
+  UrlLoadingNotifierBrowserAgent& operator=(
+      const UrlLoadingNotifierBrowserAgent&) = delete;
+  ~UrlLoadingNotifierBrowserAgent() override;
 
   // Adds |observer| to the list of observers.
   void AddObserver(UrlLoadingObserverBridge* observer);
@@ -64,9 +66,11 @@ class UrlLoadingNotifier : public KeyedService {
   void DidSwitchToTabWithUrl(const GURL& url, int new_web_state_index);
 
  private:
-  base::ObserverList<UrlLoadingObserverBridge>::Unchecked observers_;
+  explicit UrlLoadingNotifierBrowserAgent(Browser* browser);
+  friend class BrowserUserData<UrlLoadingNotifierBrowserAgent>;
+  BROWSER_USER_DATA_KEY_DECL();
 
-  DISALLOW_COPY_AND_ASSIGN(UrlLoadingNotifier);
+  base::ObserverList<UrlLoadingObserverBridge>::Unchecked observers_;
 };
 
-#endif  // IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_H_
+#endif  // IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_BROWSER_AGENT_H_

ios/chrome/browser/url_loading/url_loading_notifier.mm → ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/url_loading/url_loading_notifier.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 
 #import "ios/chrome/browser/url_loading/url_loading_observer_bridge.h"
 
@@ -10,69 +10,80 @@
 #error "This file requires ARC support."
 #endif
 
-UrlLoadingNotifier::UrlLoadingNotifier() {}
-UrlLoadingNotifier::~UrlLoadingNotifier() {}
+BROWSER_USER_DATA_KEY_IMPL(UrlLoadingNotifierBrowserAgent)
 
-void UrlLoadingNotifier::AddObserver(UrlLoadingObserverBridge* observer) {
+UrlLoadingNotifierBrowserAgent::UrlLoadingNotifierBrowserAgent(
+    Browser* browser) {}
+
+UrlLoadingNotifierBrowserAgent::~UrlLoadingNotifierBrowserAgent() {}
+
+void UrlLoadingNotifierBrowserAgent::AddObserver(
+    UrlLoadingObserverBridge* observer) {
   observers_.AddObserver(observer);
 }
 
-void UrlLoadingNotifier::RemoveObserver(UrlLoadingObserverBridge* observer) {
+void UrlLoadingNotifierBrowserAgent::RemoveObserver(
+    UrlLoadingObserverBridge* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void UrlLoadingNotifier::TabWillLoadUrl(const GURL& url,
-                                        ui::PageTransition transition_type) {
+void UrlLoadingNotifierBrowserAgent::TabWillLoadUrl(
+    const GURL& url,
+    ui::PageTransition transition_type) {
   for (auto& observer : observers_)
     observer.TabWillLoadUrl(url, transition_type);
 }
 
-void UrlLoadingNotifier::TabFailedToLoadUrl(
+void UrlLoadingNotifierBrowserAgent::TabFailedToLoadUrl(
     const GURL& url,
     ui::PageTransition transition_type) {
   for (auto& observer : observers_)
     observer.TabFailedToLoadUrl(url, transition_type);
 }
 
-void UrlLoadingNotifier::TabDidPrerenderUrl(
+void UrlLoadingNotifierBrowserAgent::TabDidPrerenderUrl(
     const GURL& url,
     ui::PageTransition transition_type) {
   for (auto& observer : observers_)
     observer.TabDidPrerenderUrl(url, transition_type);
 }
 
-void UrlLoadingNotifier::TabDidReloadUrl(const GURL& url,
-                                         ui::PageTransition transition_type) {
+void UrlLoadingNotifierBrowserAgent::TabDidReloadUrl(
+    const GURL& url,
+    ui::PageTransition transition_type) {
   for (auto& observer : observers_)
     observer.TabDidReloadUrl(url, transition_type);
 }
 
-void UrlLoadingNotifier::TabDidLoadUrl(const GURL& url,
-                                       ui::PageTransition transition_type) {
+void UrlLoadingNotifierBrowserAgent::TabDidLoadUrl(
+    const GURL& url,
+    ui::PageTransition transition_type) {
   for (auto& observer : observers_)
     observer.TabDidLoadUrl(url, transition_type);
 }
 
-void UrlLoadingNotifier::NewTabWillLoadUrl(const GURL& url,
-                                           bool user_initiated) {
+void UrlLoadingNotifierBrowserAgent::NewTabWillLoadUrl(const GURL& url,
+                                                       bool user_initiated) {
   for (auto& observer : observers_)
     observer.NewTabWillLoadUrl(url, user_initiated);
 }
 
-void UrlLoadingNotifier::NewTabDidLoadUrl(const GURL& url,
-                                          bool user_initiated) {
+void UrlLoadingNotifierBrowserAgent::NewTabDidLoadUrl(const GURL& url,
+                                                      bool user_initiated) {
   for (auto& observer : observers_)
     observer.NewTabDidLoadUrl(url, user_initiated);
 }
 
-void UrlLoadingNotifier::WillSwitchToTabWithUrl(const GURL& url,
-                                                int new_web_state_index) {
+void UrlLoadingNotifierBrowserAgent::WillSwitchToTabWithUrl(
+    const GURL& url,
+    int new_web_state_index) {
   for (auto& observer : observers_)
     observer.WillSwitchToTabWithUrl(url, new_web_state_index);
 }
 
-void UrlLoadingNotifier::DidSwitchToTabWithUrl(const GURL& url,
-                                               int new_web_state_index) {
+void UrlLoadingNotifierBrowserAgent::DidSwitchToTabWithUrl(
+    const GURL& url,
+    int new_web_state_index) {
   for (auto& observer : observers_)
     observer.DidSwitchToTabWithUrl(url, new_web_state_index);
 }

ios/chrome/browser/url_loading/url_loading_notifier_factory.cc

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ios/chrome/browser/url_loading/url_loading_notifier_factory.h"
-
-#include "base/no_destructor.h"
-#include "components/keyed_service/ios/browser_state_dependency_manager.h"
-#include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/url_loading/url_loading_notifier.h"
-
-// static
-UrlLoadingNotifier* UrlLoadingNotifierFactory::GetForBrowserState(
-    ChromeBrowserState* browser_state) {
-  return static_cast<UrlLoadingNotifier*>(
-      GetInstance()->GetServiceForBrowserState(browser_state, true));
-}
-
-// static
-UrlLoadingNotifierFactory* UrlLoadingNotifierFactory::GetInstance() {
-  static base::NoDestructor<UrlLoadingNotifierFactory> instance;
-  return instance.get();
-}
-
-UrlLoadingNotifierFactory::UrlLoadingNotifierFactory()
-    : BrowserStateKeyedServiceFactory(
-          "UrlLoadingNotifier",
-          BrowserStateDependencyManager::GetInstance()) {}
-UrlLoadingNotifierFactory::~UrlLoadingNotifierFactory() {}
-
-std::unique_ptr<KeyedService>
-UrlLoadingNotifierFactory::BuildServiceInstanceFor(
-    web::BrowserState* context) const {
-  return std::make_unique<UrlLoadingNotifier>();
-}
-
-web::BrowserState* UrlLoadingNotifierFactory::GetBrowserStateToUse(
-    web::BrowserState* context) const {
-  return GetBrowserStateOwnInstanceInIncognito(context);
-}

ios/chrome/browser/url_loading/url_loading_notifier_factory.h

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_FACTORY_H_
-#define IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_FACTORY_H_
-
-#include <memory>
-
-#include "base/macros.h"
-#include "base/no_destructor.h"
-#include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-
-class ChromeBrowserState;
-class UrlLoadingNotifier;
-
-// Singleton that owns all UrlLoadingNotifiers and associates them with
-// ChromeBrowserState.
-class UrlLoadingNotifierFactory : public BrowserStateKeyedServiceFactory {
- public:
-  static UrlLoadingNotifier* GetForBrowserState(
-      ChromeBrowserState* browser_state);
-
-  static UrlLoadingNotifierFactory* GetInstance();
-
- private:
-  friend class base::NoDestructor<UrlLoadingNotifierFactory>;
-
-  UrlLoadingNotifierFactory();
-  ~UrlLoadingNotifierFactory() override;
-
-  std::unique_ptr<KeyedService> BuildServiceInstanceFor(
-      web::BrowserState* context) const override;
-  web::BrowserState* GetBrowserStateToUse(
-      web::BrowserState* context) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(UrlLoadingNotifierFactory);
-};
-
-#endif  // IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_NOTIFIER_FACTORY_H_

ios/chrome/browser/url_loading/url_loading_service.h

@@ -15,7 +15,7 @@
 
 class AppUrlLoadingService;
 class Browser;
-class UrlLoadingNotifier;
+class UrlLoadingNotifierBrowserAgent;
 struct UrlLoadParams;
 
 // Objective-C delegate for UrlLoadingService.
@@ -31,7 +31,7 @@ struct UrlLoadParams;
 // Service used to load url in current or new tab.
 class UrlLoadingService : public KeyedService {
  public:
-  UrlLoadingService(UrlLoadingNotifier* notifier);
+  UrlLoadingService();
 
   void SetAppService(AppUrlLoadingService* app_service);
   void SetDelegate(id<URLLoadingServiceDelegate> delegate);
@@ -56,7 +56,7 @@ class UrlLoadingService : public KeyedService {
   __weak id<URLLoadingServiceDelegate> delegate_;
   AppUrlLoadingService* app_service_;
   Browser* browser_;
-  UrlLoadingNotifier* notifier_;
+  UrlLoadingNotifierBrowserAgent* notifier_;
 };
 
 #endif  // IOS_CHROME_BROWSER_URL_LOADING_URL_LOADING_SERVICE_H_

ios/chrome/browser/url_loading/url_loading_service.mm

@@ -13,7 +13,7 @@
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/ui/ntp/ntp_util.h"
 #import "ios/chrome/browser/url_loading/app_url_loading_service.h"
-#import "ios/chrome/browser/url_loading/url_loading_notifier.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
 #import "ios/chrome/browser/url_loading/url_loading_service_factory.h"
 #import "ios/chrome/browser/url_loading/url_loading_util.h"
@@ -60,8 +60,7 @@ void InduceBrowserCrash(const GURL& url) {
 }
 }
 
-UrlLoadingService::UrlLoadingService(UrlLoadingNotifier* notifier)
-    : notifier_(notifier) {}
+UrlLoadingService::UrlLoadingService() {}
 
 void UrlLoadingService::SetAppService(AppUrlLoadingService* app_service) {
   app_service_ = app_service;
@@ -73,6 +72,8 @@ void UrlLoadingService::SetDelegate(id<URLLoadingServiceDelegate> delegate) {
 
 void UrlLoadingService::SetBrowser(Browser* browser) {
   browser_ = browser;
+  if (browser_)
+    notifier_ = UrlLoadingNotifierBrowserAgent::FromBrowser(browser_);
 }
 
 void UrlLoadingService::Load(const UrlLoadParams& params) {

ios/chrome/browser/url_loading/url_loading_service_factory.mm

@@ -9,7 +9,6 @@
 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/url_loading/test_url_loading_service.h"
-#include "ios/chrome/browser/url_loading/url_loading_notifier_factory.h"
 #include "ios/chrome/browser/url_loading/url_loading_service.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -31,10 +30,7 @@ UrlLoadingServiceFactory* UrlLoadingServiceFactory::GetInstance() {
 
 std::unique_ptr<KeyedService> BuildTestUrlLoadingService(
     web::BrowserState* context) {
-  ChromeBrowserState* browser_state =
-      ChromeBrowserState::FromBrowserState(context);
-  return std::make_unique<TestUrlLoadingService>(
-      UrlLoadingNotifierFactory::GetForBrowserState(browser_state));
+  return std::make_unique<TestUrlLoadingService>();
 }
 
 // static
@@ -46,18 +42,13 @@ UrlLoadingServiceFactory::GetDefaultFactory() {
 UrlLoadingServiceFactory::UrlLoadingServiceFactory()
     : BrowserStateKeyedServiceFactory(
           "UrlLoadingService",
-          BrowserStateDependencyManager::GetInstance()) {
-  DependsOn(UrlLoadingNotifierFactory::GetInstance());
-}
+          BrowserStateDependencyManager::GetInstance()) {}
 
 UrlLoadingServiceFactory::~UrlLoadingServiceFactory() {}
 
 std::unique_ptr<KeyedService> UrlLoadingServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ChromeBrowserState* browser_state =
-      ChromeBrowserState::FromBrowserState(context);
-  return std::make_unique<UrlLoadingService>(
-      UrlLoadingNotifierFactory::GetForBrowserState(browser_state));
+  return std::make_unique<UrlLoadingService>();
 }
 
 web::BrowserState* UrlLoadingServiceFactory::GetBrowserStateToUse(

ios/chrome/browser/url_loading/url_loading_service_unittest.mm

@@ -16,6 +16,7 @@
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/url_loading/app_url_loading_service.h"
 #import "ios/chrome/browser/url_loading/test_app_url_loading_service.h"
+#import "ios/chrome/browser/url_loading/url_loading_notifier_browser_agent.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
 #import "ios/chrome/browser/url_loading/url_loading_service_factory.h"
 #include "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
@@ -81,13 +82,15 @@ class URLLoadingServiceTest : public BlockCleanupTest {
         WebUsageEnablerBrowserAgent::FromBrowser(otr_browser_.get());
     otr_enabler->SetWebUsageEnabled(false);
 
-    // Create insertion agents and configure services.
+    // Create insertion and notifier agents and configure services.
     TabInsertionBrowserAgent::CreateForBrowser(browser_.get());
+    UrlLoadingNotifierBrowserAgent::CreateForBrowser(browser_.get());
     service_->SetDelegate(url_loading_delegate_);
     service_->SetBrowser(browser_.get());
     service_->SetAppService(app_service_.get());
 
     TabInsertionBrowserAgent::CreateForBrowser(otr_browser_.get());
+    UrlLoadingNotifierBrowserAgent::CreateForBrowser(otr_browser_.get());
     otr_service_->SetDelegate(url_loading_delegate_);
     otr_service_->SetBrowser(otr_browser_.get());
     otr_service_->SetAppService(app_service_.get());