Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/search_engines/util.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/util.h"
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 112 matching lines @@
     IDMap::iterator existing_url_iter(id_to_turl.find(prepopulated_id));
     if (existing_url_iter != id_to_turl.end()) {
       // Update the data store with the new prepopulated data.  Preserve user
       // edits to the name and keyword.
       TemplateURLData data(prepopulated_url->data());
       scoped_ptr<TemplateURL> existing_url(existing_url_iter->second);
       id_to_turl.erase(existing_url_iter);
       if (!existing_url->safe_for_autoreplace()) {
         data.safe_for_autoreplace = false;
         data.SetKeyword(existing_url->keyword());
-        data.SetAutogenerateKeyword(existing_url->autogenerate_keyword());
         data.short_name = existing_url->short_name();
       }
       data.id = existing_url->id();
-      url_in_vector = new TemplateURL(profile, data);
       if (service)
-        service->UpdateKeyword(*url_in_vector);
+        service->UpdateKeyword(data);
 
       // Replace the entry in |template_urls| with the updated one.
       std::vector<TemplateURL*>::iterator j = std::find(template_urls->begin(),
           template_urls->end(), existing_url.get());
-      *j = url_in_vector;
+      *j = new TemplateURL(profile, data);
+      url_in_vector = *j;
       if (*default_search_provider == existing_url.get())
         *default_search_provider = url_in_vector;
     } else {
       template_urls->push_back(prepopulated_url.release());
       url_in_vector = template_urls->back();
     }
     DCHECK(url_in_vector);
     if (i == default_search_index && !*default_search_provider)
       *default_search_provider = url_in_vector;
   }
@@ skipping 77 matching lines @@
   if (!keyword_result.did_default_search_provider_change)
     return false;
 
   if (keyword_result.backup_valid) {
     backup_default_search_provider->reset(new TemplateURL(profile,
         keyword_result.default_search_provider_backup));
   }
   return true;
 }