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)
@@ -68,8 +68,9 @@
   // 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();
+    return (url1->keyword() == url2->keyword()) ||
+        (url1->IsGoogleSearchURLWithReplaceableKeyword() &&
+         url2->IsGoogleSearchURLWithReplaceableKeyword());
   }
 
   const TemplateURL* other_;