Move PasswordManagerMetricsUtil into PasswordManager component.

BUG=334647
TBR=thakis

Review URL: https://codereview.chromium.org/156713003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249708 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 48 insertions, 20 deletions

diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 7693c8e..21531d8a 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -14,13 +14,14 @@
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/password_manager/password_manager_driver.h"
-#include "chrome/browser/password_manager/password_manager_metrics_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/password_autofill_util.h"
+#include "components/password_manager/core/browser/password_manager_metrics_util.h"
+#include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/user_metrics.h"
diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc
index e8b4713..5a5b566 100644
--- a/chrome/browser/password_manager/password_manager_delegate_impl.cc
+++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc
@@ -14,13 +14,13 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager.h"
-#include "chrome/browser/password_manager/password_manager_metrics_util.h"
 #include "chrome/browser/password_manager/password_manager_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/password_manager/password_manager_metrics_util_unittest.cc b/chrome/browser/password_manager/password_manager_metrics_util_unittest.cc
index 3d23d1c..5efcbd2 100644
--- a/chrome/browser/password_manager/password_manager_metrics_util_unittest.cc
+++ b/chrome/browser/password_manager/password_manager_metrics_util_unittest.cc
@@ -2,7 +2,7 @@
 // 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_metrics_util.h"
+#include "components/password_manager/core/browser/password_manager_metrics_util.h"
 
 #include <iterator>
 #include <map>
@@ -12,6 +12,7 @@
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class PasswordManagerMetricsUtilTest : public testing::Test {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ce971fd..5792003 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1451,8 +1451,6 @@
         'browser/password_manager/password_manager_delegate_impl.cc',
         'browser/password_manager/password_manager_delegate_impl.h',
         'browser/password_manager/password_manager_driver.h',
-        'browser/password_manager/password_manager_metrics_util.cc',
-        'browser/password_manager/password_manager_metrics_util.h',
         'browser/password_manager/password_manager_util.h',
         'browser/password_manager/password_manager_util_android.cc',
         'browser/password_manager/password_manager_util_mac.mm',
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 368d6a8..83af1f5 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -309,13 +309,6 @@ const char kPasswordManagerEnabled[] = "profile.password_manager_enabled";
 const char kPasswordManagerAllowShowPasswords[] =
     "profile.password_manager_allow_show_passwords";
 
-// A list of numbers. Each number corresponds to one of the domains monitored
-// for save-password-prompt breakages. That number is a random index into
-// the array of groups containing the monitored domain. That group should be
-// used for reporting that domain.
-const char kPasswordManagerGroupsForDomains[] =
-    "profile.password_manager_groups_for_domains";
-
 // Booleans identifying whether normal and reverse auto-logins are enabled.
 const char kAutologinEnabled[] = "autologin.enabled";
 const char kReverseAutologinEnabled[] = "reverse_autologin.enabled";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 5d1eb3b..45ccc65 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -132,7 +132,6 @@ extern const char kWebKitPasswordEchoEnabled[];
 #endif
 extern const char kPasswordManagerEnabled[];
 extern const char kPasswordManagerAllowShowPasswords[];
-extern const char kPasswordManagerGroupsForDomains[];
 extern const char kAutologinEnabled[];
 extern const char kReverseAutologinEnabled[];
 extern const char kReverseAutologinRejectedEmailList[];
diff --git a/components/password_manager.gypi b/components/password_manager.gypi
index ac09d58..04e824b 100644
--- a/components/password_manager.gypi
+++ b/components/password_manager.gypi
@@ -32,6 +32,8 @@
         'password_manager/core/browser/password_store_consumer.h',
         'password_manager/core/browser/password_store_default.cc',
         'password_manager/core/browser/password_store_default.h',
+        'password_manager/core/browser/password_manager_metrics_util.cc',
+        'password_manager/core/browser/password_manager_metrics_util.h',
         'password_manager/core/browser/psl_matching_helper.cc',
         'password_manager/core/browser/psl_matching_helper.h',
       ],
@@ -75,6 +77,8 @@
         '..',
       ],
       'sources': [
+        'password_manager/core/common/password_manager_pref_names.cc',
+        'password_manager/core/common/password_manager_pref_names.h',
         'password_manager/core/common/password_manager_switches.cc',
         'password_manager/core/common/password_manager_switches.h',
       ],
diff --git a/chrome/browser/password_manager/password_manager_metrics_util.cc b/components/password_manager/core/browser/password_manager_metrics_util.cc
index dbdcc93..b7ac87c 100644
--- a/chrome/browser/password_manager/password_manager_metrics_util.cc
+++ b/components/password_manager/core/browser/password_manager_metrics_util.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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/password_manager_metrics_util.h"
+#include "components/password_manager/core/browser/password_manager_metrics_util.h"
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ -14,7 +14,7 @@
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/common/pref_names.h"
+#include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "url/gurl.h"
 
 using base::ListValue;
diff --git a/chrome/browser/password_manager/password_manager_metrics_util.h b/components/password_manager/core/browser/password_manager_metrics_util.h
index 6f336dc..e3166af 100644
--- a/chrome/browser/password_manager/password_manager_metrics_util.h
+++ b/components/password_manager/core/browser/password_manager_metrics_util.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_METRICS_UTIL_H_
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_METRICS_UTIL_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_METRICS_UTIL_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_METRICS_UTIL_H_
 
 #include <string>
 
@@ -43,4 +43,4 @@ std::string GroupIdToString(size_t group_id);
 
 }  // namespace password_manager_metrics_util
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_METRICS_UTIL_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_METRICS_UTIL_H_
diff --git a/components/password_manager/core/common/password_manager_pref_names.cc b/components/password_manager/core/common/password_manager_pref_names.cc
new file mode 100644
index 0000000..b3b0bb4
--- /dev/null
+++ b/components/password_manager/core/common/password_manager_pref_names.cc
@@ -0,0 +1,16 @@
+// 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 "components/password_manager/core/common/password_manager_pref_names.h"
+
+namespace prefs {
+
+// A list of numbers. Each number corresponds to one of the domains monitored
+// for save-password-prompt breakages. That number is a random index into
+// the array of groups containing the monitored domain. That group should be
+// used for reporting that domain.
+const char kPasswordManagerGroupsForDomains[] =
+    "profile.password_manager_groups_for_domains";
+
+}  // namespace prefs
diff --git a/components/password_manager/core/common/password_manager_pref_names.h b/components/password_manager/core/common/password_manager_pref_names.h
new file mode 100644
index 0000000..4c9f1e8
--- /dev/null
+++ b/components/password_manager/core/common/password_manager_pref_names.h
@@ -0,0 +1,16 @@
+// 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.
+
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_COMMON_PASSWORD_MANAGER_PREF_NAMES_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_COMMON_PASSWORD_MANAGER_PREF_NAMES_H_
+
+namespace prefs {
+
+// Alphabetical list of preference names specific to the PasswordManager
+// component. Keep alphabetized, and document each in the .cc file.
+extern const char kPasswordManagerGroupsForDomains[];
+
+}  // namespace prefs
+
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_COMMON_PASSWORD_MANAGER_PREF_NAMES_H_