Added Protector, hooked up DSE verification with error bubble.

chrome/browser/webdata/keyword_table.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/string16.h"
 #include "chrome/browser/webdata/web_database_table.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 
 class GURL;
 class TemplateURL;
 
 namespace base {
 class Time;
 }
 
@@ skipping 53 matching lines @@
   bool GetKeywords(std::vector<TemplateURL*>* urls);
 
   // Updates the database values for the specified url.
   // Returns true on success.
   bool UpdateKeyword(const TemplateURL& url);
 
   // ID (TemplateURL->id) of the default search provider.
   bool SetDefaultSearchProviderID(int64 id);
   int64 GetDefaultSearchProviderID();
 
+  // Backup of the default search provider. 0 if the setting can't be verified.
+  int64 GetDefaultSearchProviderIDBackup();
+
+  // Returns true if the default search provider ID is verified.
+  bool IsDefaultSearchProviderIDVerified();

[sky, 2011/10/21 17:20:30]

This name is a bit confusing. How about: DidDefaultSearchProviderChange() with a
description something like: Returns true if the default search provider changed
out from under us. This can happen if another process modifies our database (or
we get corruption).

[whywhat, 2011/10/21 20:31:53]

Done.

+
   // Version of the built-in keywords.
   bool SetBuiltinKeywordVersion(int version);
   int GetBuiltinKeywordVersion();
 
   // Table migration functions.
   bool MigrateToVersion21AutoGenerateKeywordColumn();
   bool MigrateToVersion25AddLogoIDColumn();
   bool MigrateToVersion26AddCreatedByPolicyColumn();
   bool MigrateToVersion28SupportsInstantColumn();
   bool MigrateToVersion29InstantUrlToSupportsInstant();
   bool MigrateToVersion38AddLastModifiedColumn();
   bool MigrateToVersion39AddSyncGUIDColumn();
   bool MigrateToVersion40AddDefaultSearchEngineBackup();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(KeywordTableTest, DefaultSearchProviderBackup);
 
   // Sets backup for id of the default search provider.
   // Backup value is used to notice when unexpected change of the id
   // occurred (i.e. by third-party process trying to modify user settings).
   bool SetDefaultSearchProviderBackupID(int64 id);
 
   // Sets signature for the backup field.
   bool SetDefaultSearchProviderBackupIDSignature(int64 id);
 
   DISALLOW_COPY_AND_ASSIGN(KeywordTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_