Add a Profile* member to TemplateURL. This makes some invocations of ReplaceSearchTerms() a bit le…

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 243 matching lines @@
 template <>
 struct ParamTraits<TemplateURL*> {
   typedef TemplateURL* param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p->data());
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
     TemplateURLData data;
     if (!ReadParam(m, iter, &data))
       return false;
-    *p = new TemplateURL(data);
+    // Since we don't have access to a Profile*, just supply NULL.  The caller
+    // can create a new TemplateURL or modify this one (e.g. via
+    // TemplateURLService::AddAndSetProfile()) to correct this later.
+    *p = new TemplateURL(NULL, data);
     return true;
   }
   static void Log(const param_type& p, std::string* l) {
     l->append("<TemplateURL*>");
   }
 };
 
 }  // namespace IPC
 
 #endif  // CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
@@ skipping 58 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 */)