Add metadata to content::PasswordForm to keep track of the password usage.

chrome/browser/password_manager/login_database.cc

Index: chrome/browser/password_manager/login_database.cc
diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc
index 704414eec69f9fc5d40370f64ea80e794637aa94..469b6b1df688b90f1c5de639e7dd67a35da11879 100644
--- a/chrome/browser/password_manager/login_database.cc
+++ b/chrome/browser/password_manager/login_database.cc
@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
+#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -20,7 +21,7 @@
 
 using content::PasswordForm;
 
-static const int kCurrentVersionNumber = 2;
+static const int kCurrentVersionNumber = 3;
 static const int kCompatibleVersionNumber = 1;
 
 namespace {
@@ -41,7 +42,8 @@ enum LoginTableColumns {
   COLUMN_BLACKLISTED_BY_USER,
   COLUMN_SCHEME,
   COLUMN_PASSWORD_TYPE,
-  COLUMN_POSSIBLE_USERNAMES
+  COLUMN_POSSIBLE_USERNAMES,
+  COLUMN_TIMES_USED
 };
 
 }  // namespace
@@ -103,17 +105,32 @@ bool LoginDatabase::Init(const base::FilePath& db_path) {
 }
 
 bool LoginDatabase::MigrateOldVersionsAsNeeded() {
-  switch (meta_table_.GetVersionNumber()) {
-    case kCompatibleVersionNumber:
-      if (!db_.Execute("ALTER TABLE logins "
-                       "ADD COLUMN password_type INTEGER") ||
-          !db_.Execute("ALTER TABLE logins "
-                       "ADD COLUMN possible_usernames BLOB")) {
+  int current_version = meta_table_.GetVersionNumber();
+  while (current_version != kCurrentVersionNumber) {
+    switch (current_version) {

[Mike Mammarella, 2013/05/15 00:08:14]

This seems like it might be a good place to use explicit fallthrough; each block
upgrades to the next version, and you can just fall through to the next upgrade.

+      case 1:
+        if (!db_.Execute("ALTER TABLE logins "
+                         "ADD COLUMN password_type INTEGER") ||
+            !db_.Execute("ALTER TABLE logins "
+                         "ADD COLUMN possible_usernames BLOB")) {
+          return false;
+        } else {
+          current_version = 2;
+        }
+        break;
+      case 2:
+        if (!db_.Execute("ALTER TABLE logins "
+                         "ADD COLUMN times_used INTEGER")) {
+          return false;
+        } else {
+          current_version = 3;
+        }
+      default:
+        NOTREACHED();
         return false;
-      } else {
-        meta_table_.SetVersionNumber(kCurrentVersionNumber);
-      }
+    }
   }
+  meta_table_.SetVersionNumber(kCurrentVersionNumber);
   return true;
 }
 
@@ -135,6 +152,7 @@ bool LoginDatabase::InitLoginsTable() {
                      "scheme INTEGER NOT NULL,"
                      "password_type INTEGER,"
                      "possible_usernames BLOB,"
+                     "times_used INTEGER,"
                      "UNIQUE "
                      "(origin_url, username_element, "
                      "username_value, password_element, "
@@ -168,6 +186,27 @@ void LoginDatabase::ReportMetrics() {
   }
   UMA_HISTOGRAM_CUSTOM_COUNTS("PasswordManager.TotalAccounts",
                               total_accounts, 0, 32, 6);
+
+  sql::Statement usage_statement(db_.GetCachedStatement(
+      SQL_FROM_HERE,
+      "SELECT password_type, times_used FROM logins"));
+
+  if (!usage_statement.is_valid())
+    return;
+
+  while (usage_statement.Step()) {
+    PasswordForm::Type type = static_cast<PasswordForm::Type>(
+        usage_statement.ColumnInt(0));
+
+    std::string password_type = "";
+    if (type == PasswordForm::TYPE_GENERATED)
+      password_type = "Generated";
+
+    UMA_HISTOGRAM_CUSTOM_COUNTS(
+        base::StringPrintf("PasswordManager.Times%sPasswordUsed",
+                           password_type.c_str()),
+        usage_statement.ColumnInt(1), 0, 100, 10);
+  }
 }
 
 bool LoginDatabase::AddLogin(const PasswordForm& form) {
@@ -180,10 +219,10 @@ bool LoginDatabase::AddLogin(const PasswordForm& form) {
       "INSERT OR REPLACE INTO logins "
       "(origin_url, action_url, username_element, username_value, "
       " password_element, password_value, submit_element, "
-      " signon_realm, ssl_valid, preferred, date_created, "
-      " blacklisted_by_user, scheme, password_type, possible_usernames) "
+      " signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
+      " scheme, password_type, possible_usernames, times_used) "
       "VALUES "
-      "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
+      "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
   s.BindString(COLUMN_ORIGIN_URL, form.origin.spec());
   s.BindString(COLUMN_ACTION_URL, form.action.spec());
   s.BindString16(COLUMN_USERNAME_ELEMENT, form.username_element);
@@ -201,6 +240,7 @@ bool LoginDatabase::AddLogin(const PasswordForm& form) {
   s.BindInt(COLUMN_PASSWORD_TYPE, form.type);
   Pickle pickle = SerializeVector(form.possible_usernames);
   s.BindBlob(COLUMN_POSSIBLE_USERNAMES, pickle.data(), pickle.size());
+  s.BindInt(COLUMN_TIMES_USED, form.times_used);
 
   return s.Run();
 }
@@ -216,7 +256,8 @@ bool LoginDatabase::UpdateLogin(const PasswordForm& form, int* items_changed) {
       "password_value = ?, "
       "ssl_valid = ?, "
       "preferred = ?, "
-      "possible_usernames = ? "
+      "possible_usernames = ?, "
+      "times_used = ? "
       "WHERE origin_url = ? AND "
       "username_element = ? AND "
       "username_value = ? AND "
@@ -229,11 +270,12 @@ bool LoginDatabase::UpdateLogin(const PasswordForm& form, int* items_changed) {
   s.BindInt(3, form.preferred);
   Pickle pickle = SerializeVector(form.possible_usernames);
   s.BindBlob(4, pickle.data(), pickle.size());
-  s.BindString(5, form.origin.spec());
-  s.BindString16(6, form.username_element);
-  s.BindString16(7, form.username_value);
-  s.BindString16(8, form.password_element);
-  s.BindString(9, form.signon_realm);
+  s.BindInt(5, form.times_used);
+  s.BindString(6, form.origin.spec());
+  s.BindString16(7, form.username_element);
+  s.BindString16(8, form.username_value);
+  s.BindString16(9, form.password_element);
+  s.BindString(10, form.signon_realm);
 
   if (!s.Run())
     return false;
@@ -310,6 +352,7 @@ bool LoginDatabase::InitPasswordFormFromStatement(PasswordForm* form,
       static_cast<const char*>(s.ColumnBlob(COLUMN_POSSIBLE_USERNAMES)),
       s.ColumnByteLength(COLUMN_POSSIBLE_USERNAMES));
   form->possible_usernames = DeserializeVector(pickle);
+  form->times_used = s.ColumnInt(COLUMN_TIMES_USED);
   return true;
 }
 
@@ -320,9 +363,9 @@ bool LoginDatabase::GetLogins(const PasswordForm& form,
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT origin_url, action_url, "
       "username_element, username_value, "
-      "password_element, password_value, "
-      "submit_element, signon_realm, ssl_valid, preferred, date_created, "
-      "blacklisted_by_user, scheme, password_type, possible_usernames "
+      "password_element, password_value, submit_element, "
+      "signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
+      "scheme, password_type, possible_usernames, times_used "
       "FROM logins WHERE signon_realm == ? "));
   s.BindString(0, form.signon_realm);
 
@@ -343,9 +386,9 @@ bool LoginDatabase::GetLoginsCreatedBetween(
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT origin_url, action_url, "
       "username_element, username_value, "
-      "password_element, password_value, "
-      "submit_element, signon_realm, ssl_valid, preferred, date_created, "
-      "blacklisted_by_user, scheme, password_type, possible_usernames "
+      "password_element, password_value, submit_element, "
+      "signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
+      "scheme, password_type, possible_usernames, times_used "
       "FROM logins WHERE date_created >= ? AND date_created < ?"
       "ORDER BY origin_url"));
   s.BindInt64(0, begin.ToTimeT());
@@ -378,9 +421,9 @@ bool LoginDatabase::GetAllLoginsWithBlacklistSetting(
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT origin_url, action_url, "
       "username_element, username_value, "
-      "password_element, password_value, "
-      "submit_element, signon_realm, ssl_valid, preferred, date_created, "
-      "blacklisted_by_user, scheme, password_type, possible_usernames "
+      "password_element, password_value, submit_element, "
+      "signon_realm, ssl_valid, preferred, date_created, blacklisted_by_user, "
+      "scheme, password_type, possible_usernames, times_used "
       "FROM logins WHERE blacklisted_by_user == ? "
       "ORDER BY origin_url"));
   s.BindInt(0, blacklisted ? 1 : 0);