diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 23:44:05 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 23:44:05 +0000 |
| commit | 8f2d8bddb95c01334a497ee5bff6f16ab02598d0 (patch) | |
| tree | f9dab06b96c01a415a07e189c095121ca605e720 /chrome/browser/google/google_url_tracker_unittest.cc | |
| parent | e2f963f190d976d507c2c56c34d0358121221a78 (diff) | |
| download | chromium_src-8f2d8bddb95c01334a497ee5bff6f16ab02598d0.zip chromium_src-8f2d8bddb95c01334a497ee5bff6f16ab02598d0.tar.gz chromium_src-8f2d8bddb95c01334a497ee5bff6f16ab02598d0.tar.bz2 | |
Move test_url_fetcher_factory.* from content/ to net/url_request
Also mark URLFetcherImpl as NET_EXPORT_PRIVATE instead of NET_EXPORT,
as it shouldn't be used except for some code in test_url_fetcher_factory.*.
Update all references.
BUG=118220
TEST=
TBR=jam@chromium.org,jhawkins@chromium.org,mnissler@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10581012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google/google_url_tracker_unittest.cc')
| -rw-r--r-- | chrome/browser/google/google_url_tracker_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index ab57d78..5a2cc69 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -16,7 +16,7 @@ #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" @@ -121,7 +121,7 @@ class GoogleURLTrackerTest : public testing::Test { virtual void SetUp(); virtual void TearDown(); - TestURLFetcher* GetFetcher(); + net::TestURLFetcher* GetFetcher(); void MockSearchDomainCheckResponse(const std::string& domain); void RequestServerCheck(); void FinishSleep(); @@ -151,7 +151,7 @@ class GoogleURLTrackerTest : public testing::Test { // 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_; @@ -185,7 +185,7 @@ void GoogleURLTrackerTest::TearDown() { 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); @@ -193,7 +193,7 @@ TestURLFetcher* GoogleURLTrackerTest::GetFetcher() { void GoogleURLTrackerTest::MockSearchDomainCheckResponse( const std::string& domain) { - TestURLFetcher* fetcher = GetFetcher(); + net::TestURLFetcher* fetcher = GetFetcher(); if (!fetcher) return; fetcher_factory_.RemoveFetcherFromMap(fetcher->id()); |