Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/password_manager/password_manager.cc

 // Copyright (c) 2011 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_manager.h"
 
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/pref_names.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "grit/generated_resources.h"
 
+using content::UserMetricsAction;
 using webkit_glue::PasswordForm;
 using webkit_glue::PasswordFormMap;
 
 // static
 void PasswordManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPasswordManagerEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPasswordManagerAllowShowPasswords,
                              true,
@@ skipping 10 matching lines @@
   static base::PlatformThreadId initial_thread_id =
       base::PlatformThread::CurrentId();
   DCHECK(initial_thread_id == base::PlatformThread::CurrentId());
 
   static bool ran_once = false;
   if (ran_once)
     return;
   ran_once = true;
 
   if (password_manager_enabled)
-    UserMetrics::RecordAction(UserMetricsAction("PasswordManager_Enabled"));
+    content::RecordAction(UserMetricsAction("PasswordManager_Enabled"));
   else
-    UserMetrics::RecordAction(UserMetricsAction("PasswordManager_Disabled"));
+    content::RecordAction(UserMetricsAction("PasswordManager_Disabled"));
 }
 
 PasswordManager::PasswordManager(TabContents* tab_contents,
                                  PasswordManagerDelegate* delegate)
     : TabContentsObserver(tab_contents),
       login_managers_deleter_(&pending_login_managers_),
       delegate_(delegate),
       observer_(NULL) {
   DCHECK(delegate_);
   password_manager_enabled_.Init(prefs::kPasswordManagerEnabled,
@@ skipping 169 matching lines @@
       delegate_->FillPasswordForm(fill_data);
       return;
     }
     default:
       if (observer_) {
         observer_->OnAutofillDataAvailable(preferred_match->username_value,
                                            preferred_match->password_value);
       }
   }
 }