Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/protector/default_search_provider_change.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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 35 matching lines @@
   explicit TemplateURLIsSame(const TemplateURL* other) : other_(other) {
   }
 
   // Returns true if both |other| and |url| are NULL or have same field values.
   bool operator()(const TemplateURL* url) {
     if (url == other_ )
       return true;
     if (!url || !other_)
       return false;
     return url->short_name() == other_->short_name() &&
-        AreKeywordsSame(url, other_) &&
+        url->HasSameKeywordAs(*other_) &&
         url->url() == other_->url() &&
         url->suggestions_url() == other_->suggestions_url() &&
         url->instant_url() == other_->instant_url() &&
         url->safe_for_autoreplace() == other_->safe_for_autoreplace() &&
         url->favicon_url() == other_->favicon_url() &&
         url->show_in_default_list() == other_->show_in_default_list() &&
         url->input_encodings() == other_->input_encodings() &&
         url->prepopulate_id() == other_->prepopulate_id();
   }
 
  private:
-  // Returns true if both |url1| and |url2| have autogenerated keywords
-  // or if their keywords are identical.
-  bool AreKeywordsSame(const TemplateURL* url1, const TemplateURL* url2) {
-    return (url1->autogenerate_keyword() && url2->autogenerate_keyword()) ||
-        url1->keyword() == url2->keyword();
-  }
-
   const TemplateURL* other_;
 };
 
 }  // namespace
 
 // Default search engine change tracked by Protector.
 class DefaultSearchProviderChange : public BaseSettingChange,
                                     public TemplateURLServiceObserver,
                                     public content::NotificationObserver {
  public:
@@ skipping 346 matching lines @@
   DCHECK(url_service);
   return url_service;
 }
 
 BaseSettingChange* CreateDefaultSearchProviderChange(TemplateURL* actual,
                                                      TemplateURL* backup) {
   return new DefaultSearchProviderChange(actual, backup);
 }
 
 }  // namespace protector