Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/importer/ie_importer.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/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ skipping 568 matching lines @@
     }
 
     std::string url(WideToUTF8(wide_url));
     SearchEnginesMap::iterator t_iter = search_engines_map.find(url);
     if (t_iter == search_engines_map.end()) {
       // First time we see that URL.
       GURL gurl(url);
       if (gurl.is_valid()) {
         TemplateURLData data;
         data.short_name = name;
-        data.SetKeyword(TemplateURLService::GenerateKeyword(gurl, false));
+        data.SetKeyword(TemplateURLService::GenerateKeyword(gurl));
         data.SetURL(url);
         data.show_in_default_list = true;
         t_iter = search_engines_map.insert(std::make_pair(url,
             new TemplateURL(NULL, data))).first;
       }
     }
   }
 
   // ProfileWriter::AddKeywords() requires a vector and we have a map.
   std::vector<TemplateURL*> search_engines;
@@ skipping 152 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }