[Password Manager] Add UMA stats for custom passphrase users.

chrome/browser/password_manager/password_store_mac.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_mac.h"
 #include "chrome/browser/password_manager/password_store_mac_internal.h"
 
 #include <CoreServices/CoreServices.h>
 #include <set>
 #include <string>
@@ skipping 857 matching lines @@
     : password_manager::PasswordStore(main_thread_runner, db_thread_runner),
       keychain_(keychain),
       login_metadata_db_(login_db) {
   DCHECK(keychain_.get());
   DCHECK(login_metadata_db_.get());
 }
 
 PasswordStoreMac::~PasswordStoreMac() {}
 
 bool PasswordStoreMac::Init(
-    const syncer::SyncableService::StartSyncFlare& flare,
-    const std::string& sync_username) {
+    const syncer::SyncableService::StartSyncFlare& flare) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   thread_.reset(new base::Thread("Chrome_PasswordStore_Thread"));
 
   if (!thread_->Start()) {
     thread_.reset(NULL);
     return false;
   }
-  return password_manager::PasswordStore::Init(flare, sync_username);
+  return password_manager::PasswordStore::Init(flare);
 }
 
 void PasswordStoreMac::Shutdown() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   password_manager::PasswordStore::Shutdown();
   thread_->Stop();
 }
 
 // Mac stores passwords in the system keychain, which can block for an
 // arbitrarily long time (most notably, it can block on user confirmation
 // from a dialog). Run tasks on a dedicated thread to avoid blocking the DB
 // thread.
 scoped_refptr<base::SingleThreadTaskRunner>
 PasswordStoreMac::GetBackgroundTaskRunner() {
   return (thread_.get()) ? thread_->message_loop_proxy() : NULL;
 }
 
-void PasswordStoreMac::ReportMetricsImpl(const std::string& sync_username) {
-  login_metadata_db_->ReportMetrics(sync_username);
+void PasswordStoreMac::ReportMetricsImpl(
+    password_manager::PasswordManagerClient* client) {
+  login_metadata_db_->ReportMetrics(client);
 }
 
 PasswordStoreChangeList PasswordStoreMac::AddLoginImpl(
     const PasswordForm& form) {
   DCHECK(thread_->message_loop() == base::MessageLoop::current());
   PasswordStoreChangeList changes;
   if (AddToKeychainIfNecessary(form)) {
     changes = login_metadata_db_->AddLogin(form);
   }
   return changes;
@@ skipping 233 matching lines @@
 
   ScopedVector<PasswordForm> merged_forms;
   merged_forms.get() = internal_keychain_helpers::GetPasswordsForForms(
       *keychain_, &database_forms);
 
   // Clean up any orphaned database entries.
   RemoveDatabaseForms(database_forms);
 
   forms->insert(forms->end(), database_forms.begin(), database_forms.end());
 }