[Password Manager] Improve signature of PasswordManagerClient::IsPasswordSyncEnabled

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 64 matching lines @@
 
   static bool ran_once = false;
   if (ran_once)
     return;
   ran_once = true;
 
   password_manager::PasswordStore* store = client->GetPasswordStore();
   // May be null in tests.
   if (store) {
     store->ReportMetrics(client->GetSyncUsername(),
-                         client->IsPasswordSyncEnabled(
-                             password_manager::ONLY_CUSTOM_PASSPHRASE));
+                         client->GetPasswordSyncState() ==
+                             password_manager::SYNCING_WITH_CUSTOM_PASSPHRASE);
   }
   UMA_HISTOGRAM_BOOLEAN("PasswordManager.Enabled", password_manager_enabled);
 }
 
 }  // namespace
 
 // static
 void ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
     content::WebContents* contents,
     autofill::AutofillClient* autofill_client) {
@@ skipping 201 matching lines @@
 password_manager::PasswordStore*
 ChromePasswordManagerClient::GetPasswordStore() const {
   // Always use EXPLICIT_ACCESS as the password manager checks IsOffTheRecord
   // itself when it shouldn't access the PasswordStore.
   // TODO(gcasto): Is is safe to change this to
   // ServiceAccessType::IMPLICIT_ACCESS?
   return PasswordStoreFactory::GetForProfile(
              profile_, ServiceAccessType::EXPLICIT_ACCESS).get();
 }
 
-bool ChromePasswordManagerClient::IsPasswordSyncEnabled(
-    password_manager::CustomPassphraseState state) const {
+password_manager::PasswordSyncState
+ChromePasswordManagerClient::GetPasswordSyncState() const {
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   if (sync_service && sync_service->HasSyncSetupCompleted() &&
       sync_service->SyncActive() &&
       sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS)) {
-    if (sync_service->IsUsingSecondaryPassphrase()) {
-      return state == password_manager::ONLY_CUSTOM_PASSPHRASE;
-    } else {
-      return state == password_manager::WITHOUT_CUSTOM_PASSPHRASE;
-    }
+    return sync_service->IsUsingSecondaryPassphrase()
+               ? password_manager::SYNCING_WITH_CUSTOM_PASSPHRASE
+               : password_manager::SYNCING_NORMAL_ENCRYPTION;
   }
-  return false;
+  return password_manager::NOT_SYNCING_PASSWORDS;
 }
 
 void ChromePasswordManagerClient::OnLogRouterAvailabilityChanged(
     bool router_can_be_used) {
   if (can_use_log_router_ == router_can_be_used)
     return;
   can_use_log_router_ = router_can_be_used;
 
   NotifyRendererOfLoggingAvailability();
 }
@@ skipping 254 matching lines @@
       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();
 }