[iOS] Fix UserAgent

A todo that was left from previous CL.

Bug: 1025225
Change-Id: I0f0bfbfbeeef992db102a6b2326eac353a0bf4a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144075
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Ali Juma <ajuma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760065}

ios/chrome/browser/web/chrome_web_client.h

@@ -61,7 +61,7 @@ class ChromeWebClient : public web::WebClient {
                         base::OnceCallback<void(NSString*)> callback) override;
   UIView* GetWindowedContainer() override;
   bool ForceMobileVersionByDefault(const GURL& url) override;
-  web::UserAgentType GetDefaultUserAgent(UIView* web_view,
+  web::UserAgentType GetDefaultUserAgent(id<UITraitEnvironment> web_view,
                                          const GURL& url) override;
 
  private:

ios/chrome/browser/web/chrome_web_client.mm

@@ -273,7 +273,8 @@ bool ChromeWebClient::ForceMobileVersionByDefault(const GURL& url) {
   return false;
 }
 
-web::UserAgentType ChromeWebClient::GetDefaultUserAgent(UIView* web_view,
+web::UserAgentType ChromeWebClient::GetDefaultUserAgent(
+    id<UITraitEnvironment> web_view,
     const GURL& url) {
   DCHECK(base::FeatureList::IsEnabled(
       web::features::kUseDefaultUserAgentInWebClient));

ios/web/navigation/navigation_item_impl.mm

@@ -228,8 +228,6 @@ UserAgentType NavigationItemImpl::GetUserAgentType(
   if (user_agent_type_ == UserAgentType::AUTOMATIC) {
     DCHECK(base::FeatureList::IsEnabled(
         features::kUseDefaultUserAgentInWebClient));
-    // TODO: Find a way to get the WebView. Passed as parameter?
-    UIView* web_view = nil;
     return GetWebClient()->GetDefaultUserAgent(web_view, url_);
   }
   return user_agent_type_;

ios/web/public/test/fakes/test_web_client.h

@@ -61,7 +61,8 @@ class TestWebClient : public web::WebClient {
                         int64_t navigation_id,
                         base::OnceCallback<void(NSString*)> callback) override;
   UIView* GetWindowedContainer() override;
-  UserAgentType GetDefaultUserAgent(UIView* web_view, const GURL& url) override;
+  UserAgentType GetDefaultUserAgent(id<UITraitEnvironment> web_view,
+                                    const GURL& url) override;
 
   // Sets |plugin_not_supported_text_|.
   void SetPluginNotSupportedText(const base::string16& text);

ios/web/public/test/fakes/test_web_client.mm

@@ -116,7 +116,8 @@ UIView* TestWebClient::GetWindowedContainer() {
   return UIApplication.sharedApplication.keyWindow.rootViewController.view;
 }
 
-UserAgentType TestWebClient::GetDefaultUserAgent(UIView* web_view,
+UserAgentType TestWebClient::GetDefaultUserAgent(
+    id<UITraitEnvironment> web_view,
     const GURL& url) {
   return default_user_agent_;
 }

ios/web/public/web_client.h

@@ -197,7 +197,8 @@ class WebClient {
 
   // Returns the UserAgentType that should be used by default for the web
   // content, based on the size class of |web_view| and the |url|.
-  virtual UserAgentType GetDefaultUserAgent(UIView* web_view, const GURL& url);
+  virtual UserAgentType GetDefaultUserAgent(id<UITraitEnvironment> web_view,
+                                            const GURL& url);
 };
 
 }  // namespace web

ios/web/web_client.mm

@@ -120,7 +120,7 @@ bool WebClient::ForceMobileVersionByDefault(const GURL&) {
   return false;
 }
 
-UserAgentType WebClient::GetDefaultUserAgent(UIView* web_view,
+UserAgentType WebClient::GetDefaultUserAgent(id<UITraitEnvironment> web_view,
                                              const GURL& url) {
   return UserAgentType::MOBILE;
 }