Added Protector, hooked up DSE verification with error bubble.

chrome/browser/webdata/web_data_service_unittest.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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 128 matching lines @@
   string16 value1_;
   string16 value2_;
   int unique_id1_, unique_id2_;
   const TimeDelta test_timeout_;
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper_;
   WaitableEvent done_event_;
 };
 
 // Simple consumer for WebIntents data. Stores the result data and quits UI
 // message loop when callback is invoked.
-class WebIntentsConsumer: public WebDataServiceConsumer {
+class WebIntentsConsumer : public WebDataServiceConsumer {
  public:
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) {
     intents.clear();
     if (result) {
       DCHECK(result->GetType() == WEB_INTENTS_RESULT);
       intents = static_cast<
           const WDResult<std::vector<WebIntentServiceData> >*>(result)->
               GetValue();
     }
 
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     MessageLoop::current()->Quit();
   }
 
   // Run the current message loop. OnWebDataServiceRequestDone will invoke
   // MessageLoop::Quit on completion, so this call will finish at that point.
   static void WaitUntilCalled() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     MessageLoop::current()->Run();
   }
 
   // Result data from completion callback.
   std::vector<WebIntentServiceData> intents;
 };
 
+// Simple consumer for Keywords data. Stores the result data and quits UI
+// message loop when callback is invoked.
+class KeywordsConsumer : public WebDataServiceConsumer {
+ public:
+  KeywordsConsumer() : load_succeeded(false) {}
+
+  virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
+                                           const WDTypedResult* result) {
+    if (result) {
+      load_succeeded = true;
+      DCHECK(result->GetType() == KEYWORDS_RESULT);
+      keywords_result =
+          reinterpret_cast<const WDResult<WDKeywordsResult>*>(
+              result)->GetValue();
+    }
+
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    MessageLoop::current()->Quit();
+  }
+
+  // Run the current message loop. OnWebDataServiceRequestDone will invoke
+  // MessageLoop::Quit on completion, so this call will finish at that point.
+  static void WaitUntilCalled() {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    MessageLoop::current()->Run();
+  }
+
+  // True if keywords data was loaded successfully.
+  bool load_succeeded;
+  // Result data from completion callback.
+  WDKeywordsResult keywords_result;
+};
+
 TEST_F(WebDataServiceAutofillTest, FormFillAdd) {
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::ADD, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::ADD, AutofillKey(name2_, value2_))
   };
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   EXPECT_CALL(
       *observer_helper_->observer(),
@@ skipping 469 matching lines @@
   WebIntentsConsumer::WaitUntilCalled();
   ASSERT_EQ(2U, consumer.intents.size());
 
   if (consumer.intents[0].action != ASCIIToUTF16("edit"))
     std::swap(consumer.intents[0],consumer.intents[1]);
 
   EXPECT_EQ(service, consumer.intents[0]);
   service.action = ASCIIToUTF16("share");
   EXPECT_EQ(service, consumer.intents[1]);
 }
+
+TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) {
+  KeywordsConsumer consumer;
+  wds_->GetKeywords(&consumer);
+  KeywordsConsumer::WaitUntilCalled();
+  ASSERT_TRUE(consumer.load_succeeded);
+  EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change);
+  EXPECT_EQ(0, consumer.keywords_result.default_search_provider_id_backup);
+}