Stop using TemplateURLServiceTestUtil to initialize TemplateURLServiceFactory

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/callback_helpers.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/search_engines/template_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_fetcher.h"
 #include "components/search_engines/template_url_service.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using base::ASCIIToUTF16;
 
 // Basic set-up for TemplateURLFetcher tests.
 class TemplateURLFetcherTest : public testing::Test {
  public:
   TemplateURLFetcherTest();
 
   virtual void SetUp() OVERRIDE {
-    test_util_.SetUp();
     TestingProfile* profile = test_util_.profile();
-    ASSERT_TRUE(profile);
-    ASSERT_TRUE(TemplateURLFetcherFactory::GetForProfile(profile));
+    ASSERT_TRUE(profile->GetRequestContext());
+    template_url_fetcher_.reset(new TemplateURLFetcher(
+        test_util_.model(), profile->GetRequestContext()));
 
-    ASSERT_TRUE(profile->GetRequestContext());
     ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
   }
 
   virtual void TearDown() OVERRIDE {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
-    test_util_.TearDown();
   }
 
   // Called when the callback is destroyed.
   void DestroyedCallback();
 
   // TemplateURLFetcherCallbacks implementation.  (Although not derived from
   // this class, this method handles those calls for the test.)
   void ConfirmAddSearchProvider(
       base::ScopedClosureRunner* callback_destruction_notifier,
       scoped_ptr<TemplateURL> template_url);
 
  protected:
   // Schedules the download of the url.
   void StartDownload(const base::string16& keyword,
                      const std::string& osdd_file_name,
                      TemplateURLFetcher::ProviderType provider_type,
                      bool check_that_file_exists);
 
   // Waits for any downloads to finish.
   void WaitForDownloadToFinish();
 
   TemplateURLServiceTestUtil test_util_;
+  scoped_ptr<TemplateURLFetcher> template_url_fetcher_;
   net::test_server::EmbeddedTestServer test_server_;
 
   // The last TemplateURL to come from a callback.
   scoped_ptr<TemplateURL> last_callback_template_url_;
 
   // How many TemplateURLFetcherTestCallbacks have been destructed.
   int callbacks_destroyed_;
 
   // How many times ConfirmAddSearchProvider has been called.
   int add_provider_called_;
@@ skipping 44 matching lines @@
   }
 
   // Start the fetch.
   GURL osdd_url = test_server_.GetURL("/" + osdd_file_name);
   GURL favicon_url;
   base::ScopedClosureRunner* callback_destruction_notifier =
       new base::ScopedClosureRunner(
           base::Bind(&TemplateURLFetcherTest::DestroyedCallback,
                      base::Unretained(this)));
 
-  TemplateURLFetcherFactory::GetForProfile(
-      test_util_.profile())->ScheduleDownload(
-          keyword, osdd_url, favicon_url,
-          TemplateURLFetcher::URLFetcherCustomizeCallback(),
-          base::Bind(&TemplateURLFetcherTest::ConfirmAddSearchProvider,
-                     base::Unretained(this),
-                     base::Owned(callback_destruction_notifier)),
-          provider_type);
+  template_url_fetcher_->ScheduleDownload(
+      keyword, osdd_url, favicon_url,
+      TemplateURLFetcher::URLFetcherCustomizeCallback(),
+      base::Bind(&TemplateURLFetcherTest::ConfirmAddSearchProvider,
+                 base::Unretained(this),
+                 base::Owned(callback_destruction_notifier)),
+      provider_type);
 }
 
 void TemplateURLFetcherTest::WaitForDownloadToFinish() {
   ASSERT_FALSE(waiting_for_download_);
   waiting_for_download_ = true;
   base::MessageLoop::current()->Run();
   waiting_for_download_ = false;
 }
 
 TEST_F(TemplateURLFetcherTest, BasicAutodetectedTest) {
@@ skipping 44 matching lines @@
         TemplateURLFetcher::AUTODETECTED_PROVIDER },
       { "Duplicate keyword with autodetected provider.", osdd_file_name + "1",
         keyword, TemplateURLFetcher::AUTODETECTED_PROVIDER },
       { "Duplicate osdd url with explicit provider.", osdd_file_name,
         base::string16(), TemplateURLFetcher::EXPLICIT_PROVIDER },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     StartDownload(test_cases[i].keyword, test_cases[i].osdd_file_name,
                   test_cases[i].provider_type, false);
-    ASSERT_EQ(
-        1,
-        TemplateURLFetcherFactory::GetForProfile(
-            test_util_.profile())->requests_count()) <<
-        test_cases[i].description;
+    ASSERT_EQ(1, template_url_fetcher_->requests_count())
+        << test_cases[i].description;
     ASSERT_EQ(i + 1, static_cast<size_t>(callbacks_destroyed_));
   }
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1 + ARRAYSIZE_UNSAFE(test_cases),
             static_cast<size_t>(callbacks_destroyed_));
   ASSERT_EQ(0, add_provider_called_);
 }
 
 TEST_F(TemplateURLFetcherTest, BasicExplicitTest) {
@@ skipping 87 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());
 }