Added Protector, hooked up DSE verification with error bubble.

chrome/browser/webdata/web_data_service.cc

Index: chrome/browser/webdata/web_data_service.cc
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 5d4a09cc9ca8c619c4b9a817cc549234bfe9e085..7ab4bc5b232bd8b1a9828a5cd2e47d746fd572aa 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/protector/protector.h"
+#include "chrome/browser/protector/setting_change.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autofill_change.h"
@@ -624,6 +626,18 @@ void WebDataService::InitializeDatabaseIfNecessary() {
     return;
   }
 
+  // Verify the default search provider id and notify UI if it's wrong.
+  KeywordTable* keyword_table = db->GetKeywordTable();
+  if (keyword_table && !keyword_table->IsDefaultSearchProviderIDVerified()) {
+    protector::SettingChange* change =
+        protector::CreateDefaultSearchProviderChange(keyword_table);
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        NewRunnableFunction(&protector::NotifyUserOfChange, change));
+    keyword_table->SetDefaultSearchProviderID(
+        keyword_table->GetDefaultSearchProviderIDBackup());

[whywhat, 2011/10/20 23:02:39]

Scott, when the ID is set to 0, there's no default search engine and
TemplateURLService doesn't find a new one. Do you know how to reset default
search engine properly here? 

[sky, 2011/10/20 23:40:59]

Don't expose the keyword table. Doing so breaks the encapsulation of
WebdataService and causes the problems you're running into.

Change NotifyDatabaseLoadedOnUIThread to take whatever you need to tell the
Protector.

If you need to go back to the default do it by way of TemplateURLService.
That'll make sure everything is reset correctly in the db (and other places).

[whywhat, 2011/10/21 16:48:18]

Done.

+  }
+
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this, &WebDataService::NotifyDatabaseLoadedOnUIThread));