Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/importer/profile_import_process_messages.h

 // 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.
 
 // Multiply-included message file, no traditonal include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
@@ skipping 177 matching lines @@
     l->append(")");
   }
 };  // ParamTraits<history::ImportedFaviconUsage
 
 // Traits for TemplateURLData
 template <>
 struct ParamTraits<TemplateURLData> {
   typedef TemplateURLData param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.short_name);
-    WriteParam(m, p.raw_keyword());
-    WriteParam(m, p.autogenerate_keyword());
+    WriteParam(m, p.keyword());
     WriteParam(m, p.url());
     WriteParam(m, p.suggestions_url);
     WriteParam(m, p.instant_url);
     WriteParam(m, p.favicon_url);
     WriteParam(m, p.originating_url);
     WriteParam(m, p.show_in_default_list);
     WriteParam(m, p.safe_for_autoreplace);
     WriteParam(m, p.input_encodings);
     WriteParam(m, p.id);
     WriteParam(m, p.date_created);
     WriteParam(m, p.last_modified);
     WriteParam(m, p.created_by_policy);
     WriteParam(m, p.usage_count);
     WriteParam(m, p.prepopulate_id);
     WriteParam(m, p.sync_guid);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
     string16 keyword;
-    bool autogenerate_keyword;
     std::string url;
     if (!ReadParam(m, iter, &p->short_name) ||
         !ReadParam(m, iter, &keyword) ||
-        !ReadParam(m, iter, &autogenerate_keyword) ||
         !ReadParam(m, iter, &url) ||
         !ReadParam(m, iter, &p->suggestions_url) ||
         !ReadParam(m, iter, &p->instant_url) ||
         !ReadParam(m, iter, &p->favicon_url) ||
         !ReadParam(m, iter, &p->originating_url) ||
         !ReadParam(m, iter, &p->show_in_default_list) ||
         !ReadParam(m, iter, &p->safe_for_autoreplace) ||
         !ReadParam(m, iter, &p->input_encodings) ||
         !ReadParam(m, iter, &p->id) ||
         !ReadParam(m, iter, &p->date_created) ||
         !ReadParam(m, iter, &p->last_modified) ||
         !ReadParam(m, iter, &p->created_by_policy) ||
         !ReadParam(m, iter, &p->usage_count) ||
         !ReadParam(m, iter, &p->prepopulate_id) ||
         !ReadParam(m, iter, &p->sync_guid))
       return false;
     p->SetKeyword(keyword);
-    p->SetAutogenerateKeyword(autogenerate_keyword);
     p->SetURL(url);
     return true;
   }
   static void Log(const param_type& p, std::string* l) {
     l->append("<TemplateURLData>");
   }
 };
 
 // Traits for TemplateURL*.
 // WARNING: These will cause us to allocate a new TemplateURL on the heap on the
@@ skipping 85 matching lines @@
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyPasswordFormReady,
                      webkit::forms::PasswordForm)
 
 // WARNING: The TemplateURL*s in the following message get heap-allocated on the
 // receiving end.  The message handler for this message MUST take ownership of
 // these pointers and ensure they're properly freed!
 IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyKeywordsReady,
                      std::vector<TemplateURL*>,
                      bool  /* unique on host and path */)