Added internal Protector key to official build

chrome/browser/webdata/keyword_table.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/webdata/keyword_table.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
@@ skipping 367 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::MigrateToVersion40AddDefaultSearchEngineBackup() {
+bool KeywordTable::MigrateToVersion40AddDefaultSearchProviderBackup() {
   int64 value = 0;
   if (!meta_table_->GetValue(kDefaultSearchProviderKey, &value)) {
     // Set default search provider ID and its backup.
+    return SetDefaultSearchProviderID(0);
+  }
+  return SetDefaultSearchProviderBackupID(value);
+}
+
+bool KeywordTable::MigrateToVersion41RewriteDefaultSearchProviderBackup() {
+  // Due to crbug.com/101815 version 40 may contain corrupt or empty
+  // signature. So ignore the signature and simply rewrite it.
+  int64 value = 0;
+  if (!meta_table_->GetValue(kDefaultSearchProviderKey, &value)) {
+    // Set default search provider ID and its backup.
     return SetDefaultSearchProviderID(0);
   }
   return SetDefaultSearchProviderBackupID(value);
 }
 
 bool KeywordTable::SetDefaultSearchProviderBackupID(int64 id) {
   return
       meta_table_->SetValue(kDefaultSearchProviderBackupKey, id) &&
       SetDefaultSearchProviderBackupIDSignature(id);
 }
 
 bool KeywordTable::SetDefaultSearchProviderBackupIDSignature(int64 id) {
   return meta_table_->SetValue(
       kDefaultSearchProviderBackupSignatureKey,
       GetSearchProviderIDSignature(id));
 }