Added Protector, hooked up DSE verification with error bubble.

chrome/browser/search_engines/util.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/search_engines/util.h"
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 46 matching lines @@
       } else {
         ids.insert(prepopulate_id);
         ++i;
       }
     } else {
       ++i;
     }
   }
 }
 
+// Returns the TemplateURL with id specified from the list of TemplateURLs.
+// If not found, returns NULL.
+TemplateURL* GetTemplateURLByID(
+    const std::vector<TemplateURL*>& template_urls,
+    int64 id) {
+  for (std::vector<TemplateURL*>::const_iterator i = template_urls.begin();
+       i != template_urls.end(); ++i) {
+    if ((*i)->id() == id) {
+      return *i;
+    }
+  }
+  return NULL;
+}
+
 // Loads engines from prepopulate data and merges them in with the existing
 // engines.  This is invoked when the version of the prepopulate data changes.
 void MergeEnginesFromPrepopulateData(
     PrefService* prefs,
     WebDataService* service,
     std::vector<TemplateURL*>* template_urls,
     const TemplateURL** default_search_provider) {
   DCHECK(service == NULL || BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(template_urls);
   DCHECK(default_search_provider);
@@ skipping 96 matching lines @@
 
   const int resource_keyword_version =
       TemplateURLPrepopulateData::GetDataVersion(prefs);
   if (keyword_result.builtin_keyword_version != resource_keyword_version) {
     // There should never be duplicate TemplateURLs. We had a bug such that
     // duplicate TemplateURLs existed for one locale. As such we invoke
     // RemoveDuplicatePrepopulateIDs to nuke the duplicates.
     RemoveDuplicatePrepopulateIDs(template_urls, service);
   }
 
-  if (keyword_result.default_search_provider_id) {
-    // See if we can find the default search provider.
-    for (std::vector<TemplateURL*>::iterator i = template_urls->begin();
-         i != template_urls->end(); ++i) {
-      if ((*i)->id() == keyword_result.default_search_provider_id) {
-        *default_search_provider = *i;
-        break;
-      }
-    }
+  int64 default_search_provider_id = keyword_result.default_search_provider_id;
+  if (default_search_provider_id) {
+    *default_search_provider =
+        GetTemplateURLByID(*template_urls, default_search_provider_id);
   }
 
   if (keyword_result.builtin_keyword_version != resource_keyword_version) {
     MergeEnginesFromPrepopulateData(prefs, service, template_urls,
                                     default_search_provider);
     *new_resource_keyword_version = resource_keyword_version;
   }
 }
 
+bool VerifyDefaultSearchProviderUsingKeywordResult(
+    const WDTypedResult& result,
+    const std::vector<TemplateURL*>& template_urls,
+    const TemplateURL** backup_default_search_provider) {
+  DCHECK(backup_default_search_provider);
+  DCHECK(*backup_default_search_provider == NULL);
+  DCHECK(result.GetType() == KEYWORDS_RESULT);

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

DCHECK_EQ

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

Done.

+
+  WDKeywordsResult keyword_result = reinterpret_cast<

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

This should take a WDKeywordsResult.

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

Do you mean the fiunction? But I'd have to reinterpret_cast the structure
pointer in the caller. I think it's better to do it there (and more consistent
with the function above).

[sky, 2011/10/21 21:34:11]

I thought the caller already was doing it. But as you say, it isn't so it's fine
like you have it.

+      const WDResult<WDKeywordsResult>*>(&result)->GetValue();
+
+  *backup_default_search_provider = GetTemplateURLByID(
+      template_urls,
+      keyword_result.default_search_provider_id_backup);
+  return keyword_result.is_default_search_provider_verified;
+}
+