Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/search_engines/template_url_prepopulate_data.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 "chrome/browser/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 26 matching lines @@
 
 namespace {
 
 // NOTE: See comments in GetDataVersion() below!  You should probably not change
 // the data in this file without changing the result of that function!
 
 // Engine definitions //////////////////////////////////////////////////////////
 
 struct PrepopulatedEngine {
   const wchar_t* const name;
-  // If empty, we'll autogenerate a keyword based on the search_url every time
-  // someone asks.  Only entries which need keywords to auto-track a dynamically
-  // generated search URL should use this.
   const wchar_t* const keyword;
   const char* const favicon_url;  // If NULL, there is no favicon.
   const char* const search_url;
   const char* const encoding;
   const char* const suggest_url;  // If NULL, this engine does not support
                                   // suggestions.
   const char* const instant_url;  // If NULL, this engine does not support
                                   // instant.
   // SEARCH_ENGINE_OTHER if there is no matching type.
   const SearchEngineType type;
@@ skipping 1018 matching lines @@
   "http://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}",
   "UTF-8",
   NULL,
   NULL,
   SEARCH_ENGINE_GOO,
   23,
 };
 
 const PrepopulatedEngine google = {
   L"Google",
-  L"",
+  L"google.com",  // This will be dynamically updated by the TemplateURL system.
   "http://www.google.com/favicon.ico",
   "{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}"
       "{google:originalQueryForSuggestion}{google:searchFieldtrialParameter}"
       "sourceid=chrome&ie={inputEncoding}&q={searchTerms}",
   "UTF-8",
   "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}"
       "client=chrome&hl={language}&q={searchTerms}",
   "{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&"
       "ie={inputEncoding}{google:instantEnabledParameter}{searchTerms}",
   SEARCH_ENGINE_GOOGLE,
@@ skipping 2052 matching lines @@
                                          const string16& name,
                                          const string16& keyword,
                                          const base::StringPiece& search_url,
                                          const base::StringPiece& suggest_url,
                                          const base::StringPiece& instant_url,
                                          const base::StringPiece& favicon_url,
                                          const base::StringPiece& encoding,
                                          int id) {
   TemplateURLData data;
   data.short_name = name;
-  if (keyword.empty())
-    data.SetAutogenerateKeyword(true);
-  else
-    data.SetKeyword(keyword);
+  data.SetKeyword(keyword);
   data.SetURL(search_url.as_string());
   data.suggestions_url = suggest_url.as_string();
   data.instant_url = instant_url.as_string();
   data.favicon_url = GURL(favicon_url.as_string());
   data.show_in_default_list = true;
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(encoding.as_string());
   data.date_created = base::Time();
   data.last_modified = base::Time();
   data.prepopulate_id = id;
@@ skipping 26 matching lines @@
     if (list->GetDictionary(i, &engine) &&
         engine->Get("name", &val) && val->GetAsString(&name) &&
         engine->Get("keyword", &val) && val->GetAsString(&keyword) &&
         engine->Get("search_url", &val) && val->GetAsString(&search_url) &&
         engine->Get("suggest_url", &val) && val->GetAsString(&suggest_url) &&
         engine->Get("instant_url", &val) && val->GetAsString(&instant_url) &&
         engine->Get("favicon_url", &val) && val->GetAsString(&favicon_url) &&
         engine->Get("encoding", &val) && val->GetAsString(&encoding) &&
         engine->Get("id", &val) && val->GetAsInteger(&id)) {
       // These next fields are not allowed to be empty.
-      if (name.empty() || search_url.empty() || favicon_url.empty() ||
-          encoding.empty())
+      if (name.empty() || keyword.empty() || search_url.empty() ||
+          favicon_url.empty() || encoding.empty())
         return;
     } else {
       // Got a parsing error. No big deal.
       continue;
     }
     t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword,
         search_url, suggest_url, instant_url, favicon_url, encoding, id));
   }
 }
 
@@ skipping 82 matching lines @@
       UTF8ToUTF16(as_gurl.host()) :
       l10n_util::GetStringUTF16(IDS_UNKNOWN_SEARCH_ENGINE_NAME);
 }
 
 SearchEngineType GetEngineType(const std::string& url) {
   const PrepopulatedEngine* engine = GetEngineForURL(url);
   return engine ? engine->type : SEARCH_ENGINE_OTHER;
 }
 
 }  // namespace TemplateURLPrepopulateData