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

chrome/browser/search_engines/template_url_fetcher_unittest.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/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 29 matching lines @@
 };
 
 // Basic set-up for TemplateURLFetcher tests.
 class TemplateURLFetcherTest : public testing::Test {
  public:
   TemplateURLFetcherTest();
 
   virtual void SetUp() OVERRIDE {
     test_util_.SetUp();
     test_util_.StartIOThread();
-    ASSERT_TRUE(test_util_.profile());
-    ASSERT_TRUE(
-        TemplateURLFetcherFactory::GetForProfile(test_util_.profile()));
+    TestingProfile* profile = test_util_.profile();
+    ASSERT_TRUE(profile);
+    ASSERT_TRUE(TemplateURLFetcherFactory::GetForProfile(profile));
 
-    test_util_.profile()->CreateRequestContext();
-    ASSERT_TRUE(test_util_.profile()->GetRequestContext());
+    profile->CreateRequestContext();
+    ASSERT_TRUE(profile->GetRequestContext());
     ASSERT_TRUE(test_server_.Start());
   }
 
   virtual void TearDown() OVERRIDE {
     test_util_.TearDown();
   }
 
   // Called by ~TemplateURLFetcherTestCallbacks.
   void DestroyedCallback(TemplateURLFetcherTestCallbacks* callbacks);
 
@@ skipping 218 matching lines @@
             last_callback_template_url_->keyword());
   EXPECT_FALSE(last_callback_template_url_->safe_for_autoreplace());
 }
 
 TEST_F(TemplateURLFetcherTest, DuplicateKeywordsTest) {
   string16 keyword(ASCIIToUTF16("test"));
   TemplateURLData data;
   data.short_name = keyword;
   data.SetKeyword(keyword);
   data.SetURL("http://example.com/");
-  test_util_.model()->Add(new TemplateURL(data));
+  test_util_.model()->Add(new TemplateURL(test_util_.profile(), data));
   test_util_.ChangeModelToLoadState();
 
   ASSERT_TRUE(test_util_.model()->GetTemplateURLForKeyword(keyword));
 
   // This should bail because the keyword already exists.
   std::string osdd_file_name("simple_open_search.xml");
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::AUTODETECTED_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(1, callbacks_destroyed_);
@@ skipping 12 matching lines @@
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::EXPLICIT_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(1, callbacks_destroyed_);
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1, add_provider_called_);
   ASSERT_EQ(2, callbacks_destroyed_);
   ASSERT_TRUE(last_callback_template_url_.get());
 }