[Sync] Rename SyncActive to IsSyncActive.

chrome/browser/password_manager/password_store_factory.cc

 // Copyright (c) 2012 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/password_store_factory.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 81 matching lines @@
 bool ShouldAffiliationBasedMatchingBeActive(Profile* profile) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!password_manager::IsAffiliationBasedMatchingEnabled(*command_line))
     return false;
 
   DCHECK(profile);
   ProfileSyncService* profile_sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
   return profile_sync_service &&
          profile_sync_service->IsSyncEnabledAndLoggedIn() &&
-         profile_sync_service->SyncActive() &&
+         profile_sync_service->IsSyncActive() &&
          profile_sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS) &&
          !profile_sync_service->IsUsingSecondaryPassphrase();
 }
 
 bool ShouldPropagatingPasswordChangesToWebCredentialsBeEnabled() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   return password_manager::IsPropagatingPasswordChangesToWebCredentialsEnabled(
       *command_line);
 }
 
@@ skipping 192 matching lines @@
   LocalProfileId id = GetLocalProfileId(prefs);
 
   scoped_ptr<PasswordStoreX::NativeBackend> backend;
   if (used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) {
     // KDE3 didn't use DBus, which our KWallet store uses.
     VLOG(1) << "Trying KWallet for password storage.";
     backend.reset(new NativeBackendKWallet(id));
     if (backend->Init()) {
       VLOG(1) << "Using KWallet for password storage.";
       used_backend = KWALLET;
-    } else
+    } else {
       backend.reset();
+    }
   } else if (used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
              used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY ||
              used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) {
 #if defined(USE_LIBSECRET)
     if (base::FieldTrialList::FindFullName(kLibsecretFieldTrialName) !=
         kLibsecretFieldTrialDisabledGroupName) {
       VLOG(1) << "Trying libsecret for password storage.";
       backend.reset(new NativeBackendLibsecret(id));
       if (backend->Init()) {
         VLOG(1) << "Using libsecret keyring for password storage.";
         used_backend = LIBSECRET;
-      } else
+      } else {
         backend.reset();
+      }
     }
 #endif  // defined(USE_LIBSECRET)
     if (!backend.get()) {
 #if defined(USE_GNOME_KEYRING)
       VLOG(1) << "Trying GNOME keyring for password storage.";
       backend.reset(new NativeBackendGnome(id));
       if (backend->Init()) {
         VLOG(1) << "Using GNOME keyring for password storage.";
         used_backend = GNOME_KEYRING;
-      } else
+      } else {
         backend.reset();
+      }
 #endif  // defined(USE_GNOME_KEYRING)
     }
   }
 
   if (!backend.get()) {
     LOG(WARNING) << "Using basic (unencrypted) store for password storage. "
         "See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage for "
         "more information about password storage options.";
   }
 
@@ skipping 94 matching lines @@
         break;
       case LIBSECRET:
         usage = OTHER_LIBSECRET;
         break;
     }
   }
   UMA_HISTOGRAM_ENUMERATION("PasswordManager.LinuxBackendStatistics", usage,
                             MAX_BACKEND_USAGE_VALUE);
 }
 #endif