[iOS] Refactor LogoVendor provider to pass webState (2/2)

This CL updates call sites to use the new LogoVendor API and removes
the old one.

Bug: 1032550
Change-Id: I8ab60c18262e46e48ba6a9dbf0e4538b12ade152
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1962281
Commit-Queue: Mark Cogan <marq@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728997}

ios/chrome/browser/providers/chromium_browser_provider.h

@@ -20,8 +20,9 @@ class ChromiumBrowserProvider : public ios::ChromeBrowserProvider {
   ios::ChromeIdentityService* GetChromeIdentityService() override;
   UITextField* CreateStyledTextField() const override NS_RETURNS_RETAINED;
   VoiceSearchProvider* GetVoiceSearchProvider() const override;
-  id<LogoVendor> CreateLogoVendor(ios::ChromeBrowserState* browser_state)
-      const override NS_RETURNS_RETAINED;
+  id<LogoVendor> CreateLogoVendor(ios::ChromeBrowserState* browser_state,
+                                  web::WebState* web_state) const override
+      NS_RETURNS_RETAINED;
   UserFeedbackProvider* GetUserFeedbackProvider() const override;
   AppDistributionProvider* GetAppDistributionProvider() const override;
   BrandedImageProvider* GetBrandedImageProvider() const override;

ios/chrome/browser/providers/chromium_browser_provider.mm

@@ -67,7 +67,8 @@ VoiceSearchProvider* ChromiumBrowserProvider::GetVoiceSearchProvider() const {
 }
 
 id<LogoVendor> ChromiumBrowserProvider::CreateLogoVendor(
-    ios::ChromeBrowserState* browser_state) const {
+    ios::ChromeBrowserState* browser_state,
+    web::WebState* web_state) const {
   return [[ChromiumLogoController alloc] init];
 }
 

ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm

@@ -118,7 +118,7 @@
          identityManager:IdentityManagerFactory::GetForBrowserState(
                              self.browserState)
               logoVendor:ios::GetChromeBrowserProvider()->CreateLogoVendor(
-                             self.browserState)];
+                             self.browserState, self.webState)];
 
   BOOL voiceSearchEnabled = ios::GetChromeBrowserProvider()
                                 ->GetVoiceSearchProvider()

ios/public/provider/chrome/browser/chrome_browser_provider.h

@@ -130,11 +130,6 @@ class ChromeBrowserProvider {
   // Returns an instance of the app distribution provider.
   virtual AppDistributionProvider* GetAppDistributionProvider() const;
 
-  // Creates and returns an object that can fetch and vend search engine logos.
-  // The caller assumes ownership of the returned object.
-  virtual id<LogoVendor> CreateLogoVendor(
-      ios::ChromeBrowserState* browser_state) const NS_RETURNS_RETAINED;
-
   virtual id<LogoVendor> CreateLogoVendor(
       ios::ChromeBrowserState* browser_state,
       web::WebState* web_state) const NS_RETURNS_RETAINED;

ios/public/provider/chrome/browser/chrome_browser_provider.mm

@@ -95,11 +95,6 @@ AppDistributionProvider* ChromeBrowserProvider::GetAppDistributionProvider()
   return nullptr;
 }
 
-id<LogoVendor> ChromeBrowserProvider::CreateLogoVendor(
-    ios::ChromeBrowserState* browser_state) const {
-  return nil;
-}
-
 id<LogoVendor> ChromeBrowserProvider::CreateLogoVendor(
     ios::ChromeBrowserState* browser_state,
     web::WebState* web_state) const {