TBR: jcivelli@chromium.org

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

7 files changed, 0 insertions, 20 deletions

diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc
index 3c1576b..7d21c47 100644
--- a/chrome/browser/password_manager/password_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_manager_unittest.cc
@@ -42,7 +42,6 @@ class TestingProfileWithPasswordStore : public TestingProfile {
 class MockPasswordStore : public PasswordStore {
  public:
   MOCK_METHOD1(RemoveLogin, void(const PasswordForm&));
-  MOCK_METHOD0(ReportMetricsImpl, void());
   MOCK_METHOD2(GetLogins, int(const PasswordForm&, PasswordStoreConsumer*));
   MOCK_METHOD1(AddLogin, void(const PasswordForm&));
   MOCK_METHOD1(UpdateLogin, void(const PasswordForm&));
diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc
index 4615e42..9277b68 100644
--- a/chrome/browser/password_manager/password_store.cc
+++ b/chrome/browser/password_manager/password_store.cc
@@ -16,7 +16,6 @@ PasswordStore::PasswordStore() : handle_(0) {
 }
 
 bool PasswordStore::Init() {
-  ReportMetrics();
   return true;
 }
 
@@ -24,10 +23,6 @@ void PasswordStore::ScheduleTask(Task* task) {
   ChromeThread::PostTask(ChromeThread::DB, FROM_HERE, task);
 }
 
-void PasswordStore::ReportMetrics() {
-  ScheduleTask(NewRunnableMethod(this, &PasswordStore::ReportMetricsImpl));
-}
-
 void PasswordStore::AddLogin(const PasswordForm& form) {
   ScheduleTask(NewRunnableMethod(this, &PasswordStore::AddLoginImpl, form));
 }
diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h
index 90ce7f3..14203fd 100644
--- a/chrome/browser/password_manager/password_store.h
+++ b/chrome/browser/password_manager/password_store.h
@@ -74,9 +74,6 @@ class PasswordStore : public base::RefCountedThreadSafe<PasswordStore> {
   // Cancels a previous Get*Logins query (async)
   void CancelLoginsQuery(int handle);
 
-  // Reports usage metrics for the database.
-  virtual void ReportMetrics();
-
  protected:
   friend class base::RefCountedThreadSafe<PasswordStore>;
   friend class browser_sync::PasswordDataTypeController;
@@ -107,8 +104,6 @@ class PasswordStore : public base::RefCountedThreadSafe<PasswordStore> {
   void ScheduleTask(Task* task);
 
   // These will be run in PasswordStore's own thread.
-  // Synchronous implementation that reports usage metrics.
-  virtual void ReportMetricsImpl() = 0;
   // Synchronous implementation to add the given login.
   virtual void AddLoginImpl(const webkit_glue::PasswordForm& form) = 0;
   // Synchronous implementation to update the given login.
diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc
index 465f889..dc58f56 100644
--- a/chrome/browser/password_manager/password_store_default.cc
+++ b/chrome/browser/password_manager/password_store_default.cc
@@ -33,10 +33,6 @@ PasswordStoreDefault::PasswordStoreDefault(LoginDatabase* login_db,
 PasswordStoreDefault::~PasswordStoreDefault() {
 }
 
-void PasswordStoreDefault::ReportMetricsImpl() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
-}
-
 void PasswordStoreDefault::AddLoginImpl(const PasswordForm& form) {
   if (login_db_->AddLogin(form)) {
     PasswordStoreChangeList changes;
diff --git a/chrome/browser/password_manager/password_store_default.h b/chrome/browser/password_manager/password_store_default.h
index ac5dbe5..43fa1c1 100644
--- a/chrome/browser/password_manager/password_store_default.h
+++ b/chrome/browser/password_manager/password_store_default.h
@@ -29,7 +29,6 @@ class PasswordStoreDefault : public PasswordStore,
   virtual ~PasswordStoreDefault();
 
   // Implements PasswordStore interface.
-  void ReportMetricsImpl();
   void AddLoginImpl(const webkit_glue::PasswordForm& form);
   void UpdateLoginImpl(const webkit_glue::PasswordForm& form);
   void RemoveLoginImpl(const webkit_glue::PasswordForm& form);
diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc
index 6571082..d31e89b 100644
--- a/chrome/browser/password_manager/password_store_mac.cc
+++ b/chrome/browser/password_manager/password_store_mac.cc
@@ -744,9 +744,6 @@ void PasswordStoreMac::ScheduleTask(Task* task) {
   }
 }
 
-void PasswordStoreMac::ReportMetricsImpl() {
-}
-
 void PasswordStoreMac::AddLoginImpl(const PasswordForm& form) {
   if (AddToKeychainIfNecessary(form)) {
     if (login_metadata_db_->AddLogin(form)) {
diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h
index fe7e2b9..381cb81 100644
--- a/chrome/browser/password_manager/password_store_mac.h
+++ b/chrome/browser/password_manager/password_store_mac.h
@@ -36,7 +36,6 @@ class PasswordStoreMac : public PasswordStore {
   virtual void ScheduleTask(Task* task);
 
  private:
-  void ReportMetricsImpl();
   void AddLoginImpl(const webkit_glue::PasswordForm& form);
   void UpdateLoginImpl(const webkit_glue::PasswordForm& form);
   void RemoveLoginImpl(const webkit_glue::PasswordForm& form);