Ensure that TemplateURLs removed by prepopulate search engine merging is also removed from Sync.

chrome/browser/search_engines/search_provider_install_data.cc

 // Copyright (c) 2012 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/search_provider_install_data.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 225 matching lines @@
   if (!result) {
     // Results are null if the database went away or (most likely) wasn't
     // loaded.
     OnLoadFailed();
     return;
   }
 
   TemplateURL* default_search_provider = NULL;
   int new_resource_keyword_version = 0;
   std::vector<TemplateURL*> extracted_template_urls;
   GetSearchProvidersUsingKeywordResult(*result,

[Peter Kasting, 2012/05/15 21:28:10]

Nit: This has so many arguments, feel free to condense onto fewer lines

[SteveT, 2012/05/16 13:26:43]

Done.

                                        NULL,
                                        NULL,
                                        &extracted_template_urls,
                                        &default_search_provider,
-                                       &new_resource_keyword_version);
+                                       &new_resource_keyword_version,
+                                       NULL);
   template_urls_.get().insert(template_urls_.get().begin(),
                               extracted_template_urls.begin(),
                               extracted_template_urls.end());
   IOThreadSearchTermsData search_terms_data(google_base_url_);
   provider_map_.reset(new SearchHostToURLsMap());
   provider_map_->Init(template_urls_.get(), search_terms_data);
   SetDefault(default_search_provider);
   NotifyLoaded();
 }
 
@@ skipping 35 matching lines @@
 
   std::for_each(closure_queue.begin(),
                 closure_queue.end(),
                 std::mem_fun_ref(&base::Closure::Run));
 
   // Since we expect this request to be rare, clear out the information. This
   // also keeps the responses current as the search providers change.
   provider_map_.reset();
   SetDefault(NULL);
 }