Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/protector/default_search_provider_change_browsertest.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 "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/protector/base_setting_change.h"
 #include "chrome/browser/protector/histograms.h"
@@ skipping 57 matching lines @@
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     EXPECT_CALL(*mock_protector_service_, Shutdown());
   }
 
   TemplateURL* MakeTemplateURL(const string16& short_name,
                                const string16& keyword,
                                const std::string& url) {
     TemplateURLData data;
     data.short_name = short_name;
-    if (keyword.empty())
-      data.SetAutogenerateKeyword(true);
-    else
-      data.SetKeyword(keyword);
+    data.SetKeyword(keyword);
     data.SetURL(url);
     return new TemplateURL(browser()->profile(), data);
   }
 
   TemplateURL* FindTemplateURL(const std::string& search_url) {
     TemplateURLService::TemplateURLVector urls =
         turl_service_->GetTemplateURLs();
     for (TemplateURLService::TemplateURLVector::const_iterator
          it = urls.begin(); it != urls.end(); ++it) {
       if ((*it)->url() == search_url)
@@ skipping 578 matching lines @@
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 }
 
 }  // namespace protector