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

Unified Diff: chrome/browser/prerender/prerender_tracker_unittest.cc

Issue 6966017: Remove a chrome dependency by removing Prerender from ResourceDispatcherHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: abort all prerender requests Created 9 years, 7 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/prerender/prerender_tracker_unittest.cc
diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc
index 4ed6f83e19a9f2a0a473a648dea68b9905e13010..b89ddbd73c4a1c3a3d9e9dd9d0022f25b9899ea8 100644
--- a/chrome/browser/prerender/prerender_tracker_unittest.cc
+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_tracker.h"
+#include "chrome/test/testing_browser_process.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -16,7 +17,8 @@ namespace {
class TestPrerenderManager : public PrerenderManager {
public:
- TestPrerenderManager() : PrerenderManager(NULL) {
+ explicit TestPrerenderManager(PrerenderTracker* prerender_tracker) :
+ PrerenderManager(NULL, prerender_tracker) {
rate_limit_enabled_ = false;
}
@@ -42,7 +44,7 @@ class PrerenderTrackerTest : public testing::Test {
PrerenderTrackerTest() :
ui_thread_(BrowserThread::UI, &message_loop_),
io_thread_(BrowserThread::IO, &message_loop_),
- prerender_manager_(new TestPrerenderManager()) {
+ prerender_manager_(new TestPrerenderManager(prerender_tracker())) {
}
TestPrerenderManager* prerender_manager() {
@@ -50,7 +52,7 @@ class PrerenderTrackerTest : public testing::Test {
}
PrerenderTracker* prerender_tracker() {
- return PrerenderTracker::GetInstance();
+ return browser_process_.get()->prerender_tracker();
}
int GetCurrentStatus(int child_id, int route_id) {
@@ -68,6 +70,7 @@ class PrerenderTrackerTest : public testing::Test {
}
private:
+ ScopedTestingBrowserProcess browser_process_;
MessageLoop message_loop_;
BrowserThread ui_thread_;
BrowserThread io_thread_;

Powered by Google App Engine
This is Rietveld 408576698