[Password Manager] Improve signature of PasswordManagerClient::IsPasswordSyncEnabled

chrome/browser/password_manager/chrome_password_manager_client_unittest.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/command_line.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 339 matching lines @@
            "https://mail.google.com&rart=234"));
   EXPECT_TRUE(client->IsPasswordManagementEnabledForCurrentPage());
 
   // Reauth pages are only on accounts.google.com
   NavigateAndCommit(
       GURL("https://other.site.com/ServiceLogin?continue="
            "https://passwords.google.com&rart=234"));
   EXPECT_TRUE(client->IsPasswordManagementEnabledForCurrentPage());
 }
 
-TEST_F(ChromePasswordManagerClientTest, IsPasswordSyncEnabled) {
+TEST_F(ChromePasswordManagerClientTest, GetPasswordSyncState) {
   ChromePasswordManagerClient* client = GetClient();
 
   ProfileSyncServiceMock* mock_sync_service =
       static_cast<ProfileSyncServiceMock*>(
           ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
               profile(), ProfileSyncServiceMock::BuildMockProfileSyncService));
 
   syncer::ModelTypeSet active_types;
   active_types.Put(syncer::PASSWORDS);
   EXPECT_CALL(*mock_sync_service, HasSyncSetupCompleted())
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*mock_sync_service, SyncActive()).WillRepeatedly(Return(true));
   EXPECT_CALL(*mock_sync_service, GetActiveDataTypes())
       .WillRepeatedly(Return(active_types));
   EXPECT_CALL(*mock_sync_service, IsUsingSecondaryPassphrase())
       .WillRepeatedly(Return(false));
 
   // Passwords are syncing and custom passphrase isn't used.
-  EXPECT_FALSE(
-      client->IsPasswordSyncEnabled(password_manager::ONLY_CUSTOM_PASSPHRASE));
-  EXPECT_TRUE(client->IsPasswordSyncEnabled(
-      password_manager::WITHOUT_CUSTOM_PASSPHRASE));
+  EXPECT_EQ(password_manager::SYNCING_NORMAL_ENCRYPTION,
+            client->GetPasswordSyncState());
 
   // Again, using a custom passphrase.
   EXPECT_CALL(*mock_sync_service, IsUsingSecondaryPassphrase())
       .WillRepeatedly(Return(true));
 
-  EXPECT_TRUE(
-      client->IsPasswordSyncEnabled(password_manager::ONLY_CUSTOM_PASSPHRASE));
-  EXPECT_FALSE(client->IsPasswordSyncEnabled(
-      password_manager::WITHOUT_CUSTOM_PASSPHRASE));
+  EXPECT_EQ(password_manager::SYNCING_WITH_CUSTOM_PASSPHRASE,
+            client->GetPasswordSyncState());
 
-  // Always return false if we aren't syncing passwords.
+  // Report correctly if we aren't syncing passwords.
   active_types.Remove(syncer::PASSWORDS);
   active_types.Put(syncer::BOOKMARKS);
   EXPECT_CALL(*mock_sync_service, GetActiveDataTypes())
       .WillRepeatedly(Return(active_types));
 
-  EXPECT_FALSE(
-      client->IsPasswordSyncEnabled(password_manager::ONLY_CUSTOM_PASSPHRASE));
-  EXPECT_FALSE(client->IsPasswordSyncEnabled(
-      password_manager::WITHOUT_CUSTOM_PASSPHRASE));
+  EXPECT_EQ(password_manager::NOT_SYNCING_PASSWORDS,
+            client->GetPasswordSyncState());
 
   // Again, without a custom passphrase.
   EXPECT_CALL(*mock_sync_service, IsUsingSecondaryPassphrase())
       .WillRepeatedly(Return(false));
 
-  EXPECT_FALSE(
-      client->IsPasswordSyncEnabled(password_manager::ONLY_CUSTOM_PASSPHRASE));
-  EXPECT_FALSE(client->IsPasswordSyncEnabled(
-      password_manager::WITHOUT_CUSTOM_PASSPHRASE));
+  EXPECT_EQ(password_manager::NOT_SYNCING_PASSWORDS,
+            client->GetPasswordSyncState());
 }
 
 TEST_F(ChromePasswordManagerClientTest, IsOffTheRecordTest) {
   ChromePasswordManagerClient* client = GetClient();
 
   profile()->ForceIncognito(true);
   EXPECT_TRUE(client->IsOffTheRecord());
 
   profile()->ForceIncognito(false);
   EXPECT_FALSE(client->IsOffTheRecord());
@@ skipping 46 matching lines @@
   profile()->ForceIncognito(true);
   EXPECT_FALSE(client->IsSavingEnabledForCurrentPage());
 
   // Functionality disabled in Incognito mode also when manager itself is
   // enabled.
   prefs()->SetUserPref(password_manager::prefs::kPasswordManagerSavingEnabled,
                        new base::FundamentalValue(true));
   EXPECT_FALSE(client->IsSavingEnabledForCurrentPage());
   profile()->ForceIncognito(false);
 }