Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/protector/default_search_provider_change.cc

Index: chrome/browser/protector/default_search_provider_change.cc
===================================================================
--- chrome/browser/protector/default_search_provider_change.cc	(revision 135424)
+++ chrome/browser/protector/default_search_provider_change.cc	(working copy)
@@ -53,7 +53,7 @@
     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() &&
@@ -65,13 +65,6 @@
   }
 
  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_;
 };