Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2703)

Unified Diff: chrome/browser/google/google_url_tracker_unittest.cc

Issue 7524033: Add a scoper object for URLFetcher::Factory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/google/google_url_tracker_unittest.cc
diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc
index a7047957ce4531a9251a7500153a55e0c6f91cdf..646a370eeb99082bb16b3835d58c572d3ba742a6 100644
--- a/chrome/browser/google/google_url_tracker_unittest.cc
+++ b/chrome/browser/google/google_url_tracker_unittest.cc
@@ -15,8 +15,8 @@
#include "chrome/test/testing_pref_service.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_service.h"
-#include "content/common/test_url_fetcher_factory.h"
#include "content/common/url_fetcher.h"
+#include "content/test/test_url_fetcher_factory.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_test_util.h"
@@ -157,13 +157,11 @@ void GoogleURLTrackerTest::SetUp() {
MessageLoop::current()->RunAllPending();
testing_browser_process_.get()->SetGoogleURLTracker(tracker);
- URLFetcher::set_factory(&fetcher_factory_);
g_browser_process->google_url_tracker()->infobar_creator_ =
&CreateTestInfobar;
}
void GoogleURLTrackerTest::TearDown() {
- URLFetcher::set_factory(NULL);
testing_browser_process_.get()->SetGoogleURLTracker(NULL);
network_change_notifier_.reset();
}
« no previous file with comments | « chrome/browser/extensions/extension_updater_unittest.cc ('k') | chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698