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 50 matching lines @@
         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();
+    return (url1->keyword() == url2->keyword()) ||
+        (url1->IsGoogleSearchURLWithReplaceableKeyword() &&
+         url2->IsGoogleSearchURLWithReplaceableKeyword());
   }
 
   const TemplateURL* other_;
 };
 
 }  // namespace
 
 // Default search engine change tracked by Protector.
 class DefaultSearchProviderChange : public BaseSettingChange,
                                     public TemplateURLServiceObserver,
@@ skipping 348 matching lines @@
   DCHECK(url_service);
   return url_service;
 }
 
 BaseSettingChange* CreateDefaultSearchProviderChange(TemplateURL* actual,
                                                      TemplateURL* backup) {
   return new DefaultSearchProviderChange(actual, backup);
 }
 
 }  // namespace protector