Move ShouldFilterAutofillResult from ChromePasswordManagerClient to PasswordManager

chrome/browser/password_manager/chrome_password_manager_client.cc

 // Copyright 2014 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 "chrome/browser/password_manager/chrome_password_manager_client.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ skipping 22 matching lines @@
 #include "components/password_manager/content/common/credential_manager_messages.h"
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/log_receiver.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_internals_service.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
+#include "components/password_manager/sync/browser/sync_store_result_filter.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "third_party/re2/re2/re2.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.h"
 #endif
@@ skipping 51 matching lines @@
 
 ChromePasswordManagerClient::ChromePasswordManagerClient(
     content::WebContents* web_contents,
     autofill::AutofillClient* autofill_client)
     : content::WebContentsObserver(web_contents),
       profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
       password_manager_(this),
       driver_factory_(nullptr),
       credential_manager_dispatcher_(web_contents, this),
       observer_(nullptr),
-      can_use_log_router_(false),
-      autofill_sync_state_(ALLOW_SYNC_CREDENTIALS),
-      sync_credential_was_filtered_(false) {
+      can_use_log_router_(false) {
   ContentPasswordManagerDriverFactory::CreateForWebContents(web_contents, this,
                                                             autofill_client);
   driver_factory_ =
       ContentPasswordManagerDriverFactory::FromWebContents(web_contents);
 
   PasswordManagerInternalsService* service =
       PasswordManagerInternalsServiceFactory::GetForBrowserContext(profile_);
   if (service)
     can_use_log_router_ = service->RegisterClient(this);
-  SetUpAutofillSyncState();
   saving_passwords_enabled_.Init(
       password_manager::prefs::kPasswordManagerSavingEnabled, GetPrefs());
   ReportMetrics(*saving_passwords_enabled_, this);
 }
 
 ChromePasswordManagerClient::~ChromePasswordManagerClient() {
   PasswordManagerInternalsService* service =
       PasswordManagerInternalsServiceFactory::GetForBrowserContext(profile_);
   if (service)
     service->UnregisterClient(this);
@@ skipping 34 matching lines @@
   }
   return is_enabled;
 }
 
 bool ChromePasswordManagerClient::IsSavingEnabledForCurrentPage() const {
   return *saving_passwords_enabled_ && !IsOffTheRecord() &&
          !DidLastPageLoadEncounterSSLErrors() &&
          IsPasswordManagementEnabledForCurrentPage();
 }
 
-bool ChromePasswordManagerClient::ShouldFilterAutofillResult(
-    const autofill::PasswordForm& form) {
-  if (!IsSyncAccountCredential(base::UTF16ToUTF8(form.username_value),
-                               form.signon_realm))
-    return false;
-
-  if (autofill_sync_state_ == DISALLOW_SYNC_CREDENTIALS) {
-    sync_credential_was_filtered_ = true;
-    return true;
-  }
-
-  if (autofill_sync_state_ == DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH &&
-      LastLoadWasTransactionalReauthPage()) {
-    sync_credential_was_filtered_ = true;
-    return true;
-  }
-
-  return false;
-}
-
 std::string ChromePasswordManagerClient::GetSyncUsername() const {
   return password_manager_sync_metrics::GetSyncUsername(profile_);
 }
 
 bool ChromePasswordManagerClient::IsSyncAccountCredential(
     const std::string& username,
     const std::string& realm) const {
   return password_manager_sync_metrics::IsSyncAccountCredential(
       profile_, username, realm);
 }
 
-void ChromePasswordManagerClient::AutofillResultsComputed() {
-  UMA_HISTOGRAM_BOOLEAN("PasswordManager.SyncCredentialFiltered",
-                        sync_credential_was_filtered_);
-  sync_credential_was_filtered_ = false;
-}
-
 bool ChromePasswordManagerClient::PromptUserToSavePassword(
     scoped_ptr<password_manager::PasswordFormManager> form_to_save,
     password_manager::CredentialSourceType type) {
   // Save password infobar and the password bubble prompts in case of
   // "webby" URLs and do not prompt in case of "non-webby" URLS (e.g. file://).
   if (!BrowsingDataHelper::IsWebScheme(
       web_contents()->GetLastCommittedURL().scheme())) {
     return false;
   }
 
@@ skipping 246 matching lines @@
 
 void ChromePasswordManagerClient::NotifyRendererOfLoggingAvailability() {
   if (!web_contents())
     return;
 
   web_contents()->GetRenderViewHost()->Send(new AutofillMsg_SetLoggingState(
       web_contents()->GetRenderViewHost()->GetRoutingID(),
       can_use_log_router_));
 }
 
-bool ChromePasswordManagerClient::LastLoadWasTransactionalReauthPage() const {
-  DCHECK(web_contents());
-  content::NavigationEntry* entry =
-      web_contents()->GetController().GetLastCommittedEntry();
-  if (!entry)
-    return false;
-
-  if (entry->GetURL().GetOrigin() !=
-      GaiaUrls::GetInstance()->gaia_url().GetOrigin())
-    return false;
-
-  // "rart" is the transactional reauth paramter.
-  std::string ignored_value;
-  return net::GetValueForKeyInQuery(entry->GetURL(),
-                                    "rart",
-                                    &ignored_value);
-}
-
 bool ChromePasswordManagerClient::IsURLPasswordWebsiteReauth(
     const GURL& url) const {
   if (url.GetOrigin() != GaiaUrls::GetInstance()->gaia_url().GetOrigin())
     return false;
 
   // "rart" param signals this page is for transactional reauth.
   std::string param_value;
   if (!net::GetValueForKeyInQuery(url, "rart", &param_value))
     return false;
 
@@ skipping 37 matching lines @@
   if (command_line->HasSwitch(
           password_manager::switches::kEnableManagerForSyncSignin))
     return true;
 
   // Default is enabled.
   std::string group_name =
       base::FieldTrialList::FindFullName("PasswordManagerStateForSyncSignin");
   return group_name != "Disabled";
 }
 
-void ChromePasswordManagerClient::SetUpAutofillSyncState() {
-  std::string group_name =
-      base::FieldTrialList::FindFullName("AutofillSyncCredential");
-
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(
-          password_manager::switches::kAllowAutofillSyncCredential)) {
-    autofill_sync_state_ = ALLOW_SYNC_CREDENTIALS;
-    return;
-  }
-  if (command_line->HasSwitch(
-          password_manager::switches::
-          kDisallowAutofillSyncCredentialForReauth)) {
-    autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH;
-    return;
-  }
-  if (command_line->HasSwitch(
-          password_manager::switches::kDisallowAutofillSyncCredential)) {
-    autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS;
-    return;
-  }
-
-  if (group_name == "DisallowSyncCredentialsForReauth") {
-    autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH;
-  } else if (group_name == "DisallowSyncCredentials") {
-      autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS;
-  } else {
-    // Allow by default.
-    autofill_sync_state_ = ALLOW_SYNC_CREDENTIALS;
-  }
-}
-
 const GURL& ChromePasswordManagerClient::GetMainFrameURL() const {
   return web_contents()->GetVisibleURL();
 }
+
+const GURL& ChromePasswordManagerClient::GetLastCommittedEntryURL() const {
+  DCHECK(web_contents());
+  content::NavigationEntry* entry =
+      web_contents()->GetController().GetLastCommittedEntry();
+  if (!entry)
+    return GURL::EmptyGURL();
+
+  return entry->GetURL();
+}
+
+scoped_ptr<password_manager::StoreResultFilter>
+ChromePasswordManagerClient::CreateStoreResultFilter() const {
+  return make_scoped_ptr(new password_manager::SyncStoreResultFilter(this));
+}