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

chrome/browser/instant/instant_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/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 39 matching lines @@
   InstantTest() {
     set_show_window(true);
     EnableDOMAutomation();
   }
 
   void EnableInstant() {
     InstantController::Enable(browser()->profile());
   }
 
   void SetupInstantProvider(const std::string& page) {
+    Profile* profile = browser()->profile();
     TemplateURLService* model =
-        TemplateURLServiceFactory::GetForProfile(browser()->profile());
+        TemplateURLServiceFactory::GetForProfile(profile);
 
     ui_test_utils::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
         content::NotificationService::AllSources());
     if (!model->loaded()) {
       model->Load();
       observer.Wait();
     }
 
     TemplateURLData data;
     data.short_name = ASCIIToUTF16("foo");
     data.SetKeyword(ASCIIToUTF16("foo"));
     data.SetURL(base::StringPrintf("http://%s:%d/files/%s?q={searchTerms}",
         test_server()->host_port_pair().host().c_str(),
         test_server()->host_port_pair().port(), page.c_str()));
     data.instant_url = data.url();
     // TemplateURLService takes ownership of this.
-    TemplateURL* template_url = new TemplateURL(data);
+    TemplateURL* template_url = new TemplateURL(profile, data);
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
   }
 
   // Type a character to get instant to trigger and determine instant support.
   void DetermineInstantSupport() {
     ui_test_utils::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
         content::NotificationService::AllSources());
     // "a" triggers the "about:" provider. "b" begins the "bing.com" keyword.
@@ skipping 907 matching lines @@
   // Press <Enter> in the omnibox, causing the preview to be committed.
   WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
   EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }