Move test_url_fetcher_factory.* from content/ to net/url_request

chrome/browser/google/google_url_tracker_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 "chrome/browser/google/google_url_tracker.h"
 
 #include <set>
 #include <string>
 
 #include "base/message_loop.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
-#include "content/public/test/test_url_fetcher_factory.h"
+#include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TabContents;
 
 // TestNotificationObserver ---------------------------------------------------
 
 namespace {
 
 class TestNotificationObserver : public content::NotificationObserver {
@@ skipping 84 matching lines @@
 
 class GoogleURLTrackerTest : public testing::Test {
  protected:
   GoogleURLTrackerTest();
   virtual ~GoogleURLTrackerTest();
 
   // testing::Test
   virtual void SetUp();
   virtual void TearDown();
 
-  TestURLFetcher* GetFetcher();
+  net::TestURLFetcher* GetFetcher();
   void MockSearchDomainCheckResponse(const std::string& domain);
   void RequestServerCheck();
   void FinishSleep();
   void NotifyIPAddressChanged();
   GURL fetched_google_url() const {
     return google_url_tracker_->fetched_google_url_;
   }
   void set_google_url(const GURL& url) {
     google_url_tracker_->google_url_ = url;
   }
   GURL google_url() const { return google_url_tracker_->google_url_; }
   void SetLastPromptedGoogleURL(const GURL& url);
   GURL GetLastPromptedGoogleURL();
   void SetSearchPending(const GURL& search_url, int unique_id);
   void CommitSearch(int unique_id);
   void CloseTab(int unique_id);
   TestInfoBarDelegate* GetInfoBar(int unique_id);
   void ExpectDefaultURLs();
 
   scoped_ptr<TestNotificationObserver> observer_;
 
  private:
   // These are required by the TestURLFetchers GoogleURLTracker will create (see
   // test_url_fetcher_factory.h).
   MessageLoop message_loop_;
   content::TestBrowserThread io_thread_;
   // Creating this allows us to call
   // net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests().
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
-  TestURLFetcherFactory fetcher_factory_;
+  net::TestURLFetcherFactory fetcher_factory_;
   content::NotificationRegistrar registrar_;
   TestingProfile profile_;
   scoped_ptr<GoogleURLTracker> google_url_tracker_;
   // This tracks the different "tabs" a test has "opened", so we can close them
   // properly before shutting down |google_url_tracker_|, which expects that.
   std::set<int> unique_ids_seen_;
 };
 
 GoogleURLTrackerTest::GoogleURLTrackerTest()
     : observer_(new TestNotificationObserver),
@@ skipping 13 matching lines @@
 }
 
 void GoogleURLTrackerTest::TearDown() {
   while (!unique_ids_seen_.empty())
     CloseTab(*unique_ids_seen_.begin());
 
   google_url_tracker_.reset();
   network_change_notifier_.reset();
 }
 
-TestURLFetcher* GoogleURLTrackerTest::GetFetcher() {
+net::TestURLFetcher* GoogleURLTrackerTest::GetFetcher() {
   // This will return the last fetcher created.  If no fetchers have been
   // created, we'll pass GetFetcherByID() "-1", and it will return NULL.
   return fetcher_factory_.GetFetcherByID(google_url_tracker_->fetcher_id_ - 1);
 }
 
 void GoogleURLTrackerTest::MockSearchDomainCheckResponse(
     const std::string& domain) {
-  TestURLFetcher* fetcher = GetFetcher();
+  net::TestURLFetcher* fetcher = GetFetcher();
   if (!fetcher)
     return;
   fetcher_factory_.RemoveFetcherFromMap(fetcher->id());
   fetcher->set_url(GURL(GoogleURLTracker::kSearchDomainCheckURL));
   fetcher->set_response_code(200);
   fetcher->SetResponseString(domain);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   // At this point, |fetcher| is deleted.
 }
 
@@ skipping 618 matching lines @@
   EXPECT_FALSE(observer_->notified());
 
   infobar4->Accept();
   EXPECT_TRUE(GetInfoBar(1) == NULL);
   EXPECT_TRUE(GetInfoBar(3) == NULL);
   EXPECT_TRUE(GetInfoBar(4) == NULL);
   EXPECT_EQ(GURL("http://www.google.co.jp/"), google_url());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
   EXPECT_TRUE(observer_->notified());
 }