  }
  
  bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1515,14 +1507,7 @@
+@@ -1286,6 +1281,8 @@
+ 
+ void TemplateURLService::Init(const Initializer* initializers,
+                               int num_initializers) {
++  should_autocollect_ = ShouldAutocollect();
++
+   if (client_)
+     client_->SetOwner(this);
+ 
+@@ -1515,18 +1512,11 @@
  
  bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
      const std::string& host) const {

 TemplateURLService::TemplateURLService(const Initializer* initializers,
                                        const int count)
     : prefs_(nullptr),
+      should_autocollect_(ShouldAutocollect()),
       search_terms_data_(new SearchTermsData),
       web_data_service_(nullptr),
       google_url_tracker_(nullptr),
@@ -309,23 +317,7 @@
   DCHECK(!keyword.empty());  // This should only be called for non-empty
                              // keywords. If we need to support empty kewords
                              // the code needs to change slightly.
-  TemplateURL* existing_url = GetTemplateURLForKeyword(keyword);
-  if (template_url_to_replace)
-    *template_url_to_replace = existing_url;
-  if (existing_url) {
-    // We already have a TemplateURL for this keyword. Only allow it to be
-    // replaced if the TemplateURL can be replaced.

     rappor::RapporServiceImpl* rappor_service,
     const base::Closure& dsp_change_callback)
     : prefs_(prefs),
+      should_autocollect_(true),
       search_terms_data_(std::move(search_terms_data)),
       web_data_service_(web_data_service),
       client_(std::move(client)),
