Add a separate protector UMA state when backup is overwritten by migration.

chrome/browser/webdata/keyword_table.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/webdata/keyword_table.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 96 matching lines @@
 }
 
 // Checks if signature for search provider id is correct and returns the
 // result.
 bool IsSearchProviderIDValid(int64 id, const std::string& signature) {
   return protector::IsSettingValid(base::Int64ToString(id), signature);
 }
 
 }  // anonymous namespace
 
+KeywordTable::KeywordTable(sql::Connection* db, sql::MetaTable* meta_table)
+    : WebDatabaseTable(db, meta_table),
+      backup_overwritten_(false) {
+}
+
 KeywordTable::~KeywordTable() {}
 
 bool KeywordTable::Init() {
   return db_->DoesTableExist("keywords") ||
       (db_->Execute("CREATE TABLE keywords ("
                     "id INTEGER PRIMARY KEY,"
                     "short_name VARCHAR NOT NULL,"
                     "keyword VARCHAR NOT NULL,"
                     "favicon_url VARCHAR NOT NULL,"
                     "url VARCHAR NOT NULL,"
@@ skipping 123 matching lines @@
 
   int64 backup_id = kInvalidTemplateURLID;
   meta_table_->GetValue(kDefaultSearchIDBackupKey, &backup_id);
   int64 current_id = GetDefaultSearchProviderID();
   if (backup_id == current_id) {
     // Either this is a new profile and both IDs are kInvalidTemplateURLID or
     // the search engines with the ids are equal.
     if (backup_id == kInvalidTemplateURLID) {
       UMA_HISTOGRAM_ENUMERATION(
           protector::kProtectorHistogramDefaultSearchProvider,
-          protector::kProtectorErrorValueValidZero,
+          backup_overwritten_ ?
+              protector::kProtectorErrorOverwrittenByMigration :
+              protector::kProtectorErrorValueValidZero,
           protector::kProtectorErrorCount);
       return false;
     }
     std::string backup_url;
     std::string current_url;
     if (GetKeywordAsString(backup_id, "keywords_backup", &backup_url) &&
         GetKeywordAsString(current_id, "keywords", &current_url) &&
         current_url == backup_url) {
       UMA_HISTOGRAM_ENUMERATION(
           protector::kProtectorHistogramDefaultSearchProvider,
-          protector::kProtectorErrorValueValid,
+          backup_overwritten_ ?
+              protector::kProtectorErrorOverwrittenByMigration :
+              protector::kProtectorErrorValueValid,
           protector::kProtectorErrorCount);
       return false;
     }
   }
 
   UMA_HISTOGRAM_ENUMERATION(
       protector::kProtectorHistogramDefaultSearchProvider,
       protector::kProtectorErrorValueChanged,
       protector::kProtectorErrorCount);
   LOG(WARNING) << "Default Search Provider has changed.";
@@ skipping 65 matching lines @@
 bool KeywordTable::MigrateToVersion38AddLastModifiedColumn() {
   return db_->Execute(
       "ALTER TABLE keywords ADD COLUMN last_modified INTEGER DEFAULT 0");
 }
 
 bool KeywordTable::MigrateToVersion39AddSyncGUIDColumn() {
   return db_->Execute("ALTER TABLE keywords ADD COLUMN sync_guid VARCHAR");
 }
 
 bool KeywordTable::MigrateToVersion44AddDefaultSearchProviderBackup() {
-  return IsBackupSignatureValid(44) || UpdateBackupSignature(44);
+  if (IsBackupSignatureValid(44))
+    return true;
+  backup_overwritten_ = true;
+  return UpdateBackupSignature(44);
 }
 
 bool KeywordTable::MigrateToVersion45RemoveLogoIDAndAutogenerateColumns() {
   sql::Transaction transaction(db_);
   if (!transaction.Begin())
     return false;
 
   // The version 43 migration should have been written to do this, but since it
   // wasn't, we'll do it now.  Unfortunately a previous change deleted this for
   // some users, so we can't be sure this will succeed (so don't bail on error).
@@ skipping 250 matching lines @@
     }
   }
 
   // Replace the old table with the new one.
   sql = "DROP TABLE " + name;
   if (!db_->Execute(sql.c_str()))
     return false;
   sql = "ALTER TABLE keywords_temp RENAME TO " + name;
   return db_->Execute(sql.c_str());
 }