Added Protector, hooked up DSE verification with error bubble.

chrome/browser/webdata/web_data_service.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/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #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"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
@@ skipping 593 matching lines @@
     LOG(ERROR) << "Cannot initialize the web database: " << init_status;
     failed_init_ = true;
     delete db;
     if (main_loop_) {
       main_loop_->PostTask(FROM_HERE,
           NewRunnableMethod(this, &WebDataService::DBInitFailed, init_status));
     }
     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));
 
   db_ = db;
   db_->BeginTransaction();
 }
 
 void WebDataService::InitializeSyncableServices() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
@@ skipping 794 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }