[ios][PhishGuard] Pass in mime type into PasswordProtectionRequest

Design doc: go/bling-phishguard

Prepares files to move to /core folder.

The WebContents is mostly a pass-through object (not including CSD)
in PasswordProtectionRequest, except for the MIME type. This CL
passes the MIME type in so that we don't need to conditionally
compile calls to WebState and WebContents for this value.

Bug: 1147967
Change-Id: Ic7ba3180af78806a90df0f776cf6d984553af3f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2553386Reviewed-by: Ali Juma <ajuma@chromium.org>
Reviewed-by: Bettina Dea <bdea@chromium.org>
Commit-Queue: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830598}

chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc

@@ -331,14 +331,16 @@ class ChromePasswordProtectionServiceTest
         {"somedomain.com"}};
     if (trigger_type == LoginReputationClientRequest::UNFAMILIAR_LOGIN_PAGE) {
       request_ = new PasswordProtectionRequest(
-          web_contents(), GURL(kPhishingURL), GURL(), GURL(), kUserName,
+          web_contents(), GURL(kPhishingURL), GURL(), GURL(),
+          web_contents()->GetContentsMimeType(), kUserName,
           PasswordType::PASSWORD_TYPE_UNKNOWN, credentials, trigger_type, true,
           service_.get(), 0);
     } else {
       ASSERT_EQ(LoginReputationClientRequest::PASSWORD_REUSE_EVENT,
                 trigger_type);
       request_ = new PasswordProtectionRequest(
-          web_contents(), GURL(kPhishingURL), GURL(), GURL(), kUserName,
+          web_contents(), GURL(kPhishingURL), GURL(), GURL(),
+          web_contents()->GetContentsMimeType(), kUserName,
           reused_password_type, credentials, trigger_type,
           /* password_field_exists*/ true, service_.get(),
           /*request_timeout_in_ms=*/0);

components/safe_browsing/content/password_protection/password_protection_navigation_throttle_unittest.cc

@@ -55,6 +55,7 @@ class PasswordProtectionNavigationThrottleTest
     scoped_refptr<PasswordProtectionRequest> request =
         new PasswordProtectionRequest(
             RenderViewHostTestHarness::web_contents(), GURL(), GURL(), GURL(),
+            RenderViewHostTestHarness::web_contents()->GetContentsMimeType(),
             "username", PasswordType::PASSWORD_TYPE_UNKNOWN, credentials,
             LoginReputationClientRequest::PASSWORD_REUSE_EVENT,
             /* password_field_exists*/ true, password_protection_service.get(),

components/safe_browsing/content/password_protection/password_protection_request.cc

@@ -103,6 +103,7 @@ PasswordProtectionRequest::PasswordProtectionRequest(
     const GURL& main_frame_url,
     const GURL& password_form_action,
     const GURL& password_form_frame_url,
+    const std::string& mime_type,
     const std::string& username,
     PasswordType password_type,
     const std::vector<password_manager::MatchingReusedCredential>&
@@ -116,6 +117,7 @@ PasswordProtectionRequest::PasswordProtectionRequest(
       main_frame_url_(main_frame_url),
       password_form_action_(password_form_action),
       password_form_frame_url_(password_form_frame_url),
+      mime_type_(mime_type),
       username_(username),
       password_type_(password_type),
       matching_domains_(GetMatchingDomains(matching_reused_credentials)),
@@ -258,7 +260,7 @@ void PasswordProtectionRequest::FillRequestProto(bool is_sampled_ping) {
       password_protection_service_->UserClickedThroughSBInterstitial(this);
   request_proto_->set_clicked_through_interstitial(
       clicked_through_interstitial);
-  request_proto_->set_content_type(web_contents_->GetContentsMimeType());
+  request_proto_->set_content_type(mime_type_);
 
 #if BUILDFLAG(FULL_SAFE_BROWSING)
   if (password_protection_service_->IsExtendedReporting() &&

components/safe_browsing/content/password_protection/password_protection_request.h

@@ -77,6 +77,7 @@ class PasswordProtectionRequest
       const GURL& main_frame_url,
       const GURL& password_form_action,
       const GURL& password_form_frame_url,
+      const std::string& mime_type,
       const std::string& username,
       PasswordType password_type,
       const std::vector<password_manager::MatchingReusedCredential>&
@@ -228,6 +229,9 @@ class PasswordProtectionRequest
   // Frame url of the detected password form.
   const GURL password_form_frame_url_;
 
+  // The contents MIME type.
+  const std::string& mime_type_;
+
   // The username of the reused password hash. The username can be an email or
   // a username for a non-GAIA or saved-password reuse. No validation has been
   // done on it.

components/safe_browsing/content/password_protection/password_protection_service.cc

@@ -230,9 +230,9 @@ void PasswordProtectionService::StartRequest(
   scoped_refptr<PasswordProtectionRequest> request(
       new PasswordProtectionRequest(
           web_contents, main_frame_url, password_form_action,
-          password_form_frame_url, username, password_type,
-          matching_reused_credentials, trigger_type, password_field_exists,
-          this, GetRequestTimeoutInMS()));
+          password_form_frame_url, web_contents->GetContentsMimeType(),
+          username, password_type, matching_reused_credentials, trigger_type,
+          password_field_exists, this, GetRequestTimeoutInMS()));
   request->Start();
   pending_requests_.insert(std::move(request));
 }

components/safe_browsing/content/password_protection/password_protection_service_unittest.cc

@@ -306,7 +306,8 @@ class PasswordProtectionServiceTest : public ::testing::TestWithParam<bool> {
 
     request_ = new PasswordProtectionRequest(
         web_contents, target_url, GURL(kFormActionUrl), GURL(kPasswordFrameUrl),
-        kUserName, PasswordType::PASSWORD_TYPE_UNKNOWN, {},
+        web_contents->GetContentsMimeType(), kUserName,
+        PasswordType::PASSWORD_TYPE_UNKNOWN, {},
         LoginReputationClientRequest::UNFAMILIAR_LOGIN_PAGE, true,
         password_protection_service_.get(), timeout_in_ms);
     request_->Start();
@@ -325,7 +326,8 @@ class PasswordProtectionServiceTest : public ::testing::TestWithParam<bool> {
             Return(match_whitelist ? AsyncMatch::MATCH : AsyncMatch::NO_MATCH));
 
     request_ = new PasswordProtectionRequest(
-        web_contents, target_url, GURL(), GURL(), kUserName, type,
+        web_contents, target_url, GURL(), GURL(),
+        web_contents->GetContentsMimeType(), kUserName, type,
         matching_reused_credentials,
         LoginReputationClientRequest::PASSWORD_REUSE_EVENT, true,
         password_protection_service_.get(), timeout_in_ms);