[ios] Removed two uses of GetUrlLoader from service

Replace UrlLoader gotten from the UrlLoadingService with the service itself.

Bug: 907527
Change-Id: I8b27152a70f7d39b2b378cc7f774aa57e2439e23
Reviewed-on: https://chromium-review.googlesource.com/c/1481411Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: David Jean <djean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636390}

ios/chrome/browser/ui/main/browser_coordinator.mm

@@ -274,10 +274,7 @@
       initWithBaseViewController:self.viewController
                     browserState:self.browserState];
   self.pageInfoCoordinator.dispatcher = self.dispatcher;
-  self.pageInfoCoordinator.loader =
-      UrlLoadingServiceFactory::GetForBrowserState(self.browserState)
-          ->GetUrlLoader();
-  ;
+
   self.pageInfoCoordinator.presentationProvider = self.viewController;
   self.pageInfoCoordinator.tabModel = self.tabModel;
 
@@ -362,10 +359,7 @@
 - (void)showReadingList {
   self.readingListCoordinator = [[ReadingListCoordinator alloc]
       initWithBaseViewController:self.viewController
-                    browserState:self.browserState
-                          loader:UrlLoadingServiceFactory::GetForBrowserState(
-                                     self.browserState)
-                                     ->GetUrlLoader()];
+                    browserState:self.browserState];
   [self.readingListCoordinator start];
 }
 

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

@@ -55,6 +55,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/fullscreen:coordinators",
     "//ios/chrome/browser/ui/page_info/requirements",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",
     "//ios/web/public",

ios/chrome/browser/ui/page_info/page_info_legacy_coordinator.h

@@ -10,7 +10,6 @@
 @class CommandDispatcher;
 @protocol PageInfoPresentation;
 @class TabModel;
-@protocol UrlLoader;
 
 // Notification sent when the page info is shown.
 extern NSString* const kPageInfoWillShowNotification;
@@ -28,9 +27,6 @@ extern NSString* const kPageInfoWillHideNotification;
 // coordinator will register itself as the target for PageInfoCommands.
 @property(nonatomic, weak) CommandDispatcher* dispatcher;
 
-// The UrlLoader to be used by this coordinator.
-@property(nonatomic, weak) id<UrlLoader> loader;
-
 // |presentationProvider| provides information and runs tasks necessary to
 // present Page Info.
 @property(nonatomic, weak) id<PageInfoPresentation> presentationProvider;

ios/chrome/browser/ui/page_info/page_info_legacy_coordinator.mm

@@ -21,7 +21,8 @@
 #import "ios/chrome/browser/ui/page_info/page_info_view_controller.h"
 #import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
 #import "ios/chrome/browser/ui/page_info/requirements/page_info_reloading.h"
-#import "ios/chrome/browser/ui/url_loader.h"
+#import "ios/chrome/browser/url_loading/url_loading_service.h"
+#import "ios/chrome/browser/url_loading/url_loading_service_factory.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #include "ios/web/public/navigation_item.h"
 #include "ios/web/public/navigation_manager.h"
@@ -49,7 +50,6 @@ NSString* const kPageInfoWillHideNotification =
 @implementation PageInfoLegacyCoordinator
 
 @synthesize dispatcher = _dispatcher;
-@synthesize loader = _loader;
 @synthesize pageInfoViewController = _pageInfoViewController;
 @synthesize presentationProvider = _presentationProvider;
 @synthesize tabModel = _tabModel;
@@ -62,7 +62,6 @@ NSString* const kPageInfoWillHideNotification =
   DCHECK(!self.pageInfoViewController);
   [self.dispatcher stopDispatchingToTarget:self];
   self.dispatcher = nil;
-  self.loader = nil;
   self.presentationProvider = nil;
   self.tabModel = nil;
 }
@@ -157,7 +156,8 @@ NSString* const kPageInfoWillHideNotification =
                                 inBackground:NO
                                     appendTo:kLastTab];
 
-  [self.loader webPageOrderedOpen:command];
+  UrlLoadingServiceFactory::GetForBrowserState(self.browserState)
+      ->OpenUrlInNewTab(command);
   [self hidePageInfo];
 }
 

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

@@ -56,6 +56,7 @@ source_set("reading_list") {
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/common/favicon",
     "//ios/web",
     "//ios/web/public",

ios/chrome/browser/ui/reading_list/reading_list_coordinator.h

@@ -7,8 +7,6 @@
 
 #import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
-@protocol UrlLoader;
-
 // Coordinator for Reading List, displaying the Reading List when starting.
 @interface ReadingListCoordinator : ChromeCoordinator
 
@@ -17,7 +15,6 @@
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController
                               browserState:
                                   (ios::ChromeBrowserState*)browserState
-                                    loader:(id<UrlLoader>)loader
     NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController

ios/chrome/browser/ui/reading_list/reading_list_coordinator.mm

@@ -31,8 +31,9 @@
 #import "ios/chrome/browser/ui/table_view/table_view_navigation_controller.h"
 #import "ios/chrome/browser/ui/table_view/table_view_navigation_controller_constants.h"
 #import "ios/chrome/browser/ui/table_view/table_view_presentation_controller.h"
-#import "ios/chrome/browser/ui/url_loader.h"
 #import "ios/chrome/browser/ui/util/pasteboard_util.h"
+#import "ios/chrome/browser/url_loading/url_loading_service.h"
+#import "ios/chrome/browser/url_loading/url_loading_service_factory.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/web/public/referrer.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -50,8 +51,6 @@
 
 // Whether the coordinator is started.
 @property(nonatomic, assign, getter=isStarted) BOOL started;
-// The URL loader used to load pages that have been added to the reading list.
-@property(nonatomic, strong) id<UrlLoader> loader;
 // The mediator that updates the table for model changes.
 @property(nonatomic, strong) ReadingListMediator* mediator;
 // The navigation controller displaying self.tableViewController.
@@ -68,7 +67,6 @@
 
 @implementation ReadingListCoordinator
 @synthesize started = _started;
-@synthesize loader = _loader;
 @synthesize mediator = _mediator;
 @synthesize navigationController = _navigationController;
 @synthesize tableViewController = _tableViewController;
@@ -76,13 +74,9 @@
 
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController
                               browserState:
-                                  (ios::ChromeBrowserState*)browserState
-                                    loader:(id<UrlLoader>)loader {
+                                  (ios::ChromeBrowserState*)browserState {
   self = [super initWithBaseViewController:viewController
                               browserState:browserState];
-  if (self) {
-    _loader = loader;
-  }
   return self;
 }
 
@@ -375,14 +369,16 @@ animationControllerForDismissedController:(UIViewController*)dismissed {
                                    inIncognito:incognito
                                   inBackground:NO
                                       appendTo:kLastTab];
-    [self.loader webPageOrderedOpen:command];
+    UrlLoadingServiceFactory::GetForBrowserState(self.browserState)
+        ->OpenUrlInNewTab(command);
   } else {
     web::NavigationManager::WebLoadParams params(loadURL);
     params.transition_type = ui::PAGE_TRANSITION_AUTO_BOOKMARK;
     params.referrer = web::Referrer(GURL(kReadingListReferrerURL),
                                     web::ReferrerPolicyDefault);
     ChromeLoadParams chromeParams(params);
-    [self.loader loadURLWithParams:chromeParams];
+    UrlLoadingServiceFactory::GetForBrowserState(self.browserState)
+        ->LoadUrlInCurrentTab(chromeParams);
   }
 
   [self stop];