trunk/src/chrome/browser/prerender/prerender_unittest.cc - Issue 23551005: Revert 219709 "Remove the Extensions URLRequestContext."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/prerender/prerender_unittest.cc

Issue 23551005: Revert 219709 "Remove the Extensions URLRequestContext." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 4 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

« no previous file with comments | « trunk/src/chrome/browser/prefs/pref_model_associator_unittest.cc ('k') | trunk/src/chrome/browser/printing/print_dialog_cloud_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/prerender/prerender_unittest.cc

===================================================================

--- trunk/src/chrome/browser/prerender/prerender_unittest.cc (revision 219785)

+++ trunk/src/chrome/browser/prerender/prerender_unittest.cc (working copy)

@@ -5,6 +5,7 @@

#include "base/command_line.h"

#include "base/format_macros.h"

#include "base/memory/scoped_vector.h"

+#include "base/message_loop/message_loop.h"

#include "base/strings/stringprintf.h"

#include "base/time/time.h"

#include "chrome/browser/prerender/prerender_contents.h"

@@ -15,9 +16,8 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile.h"

-#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_view_host.h"

-#include "content/public/test/test_browser_thread_bundle.h"

+#include "content/public/test/test_browser_thread.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/gfx/size.h"

#include "url/gurl.h"

@@ -277,7 +277,8 @@

static const int kDefaultChildId = -1;

static const int kDefaultRenderViewRouteId = -1;

- PrerenderTest() : prerender_manager_(new UnitTestPrerenderManager(

+ PrerenderTest() : ui_thread_(BrowserThread::UI, &message_loop_),

+ prerender_manager_(new UnitTestPrerenderManager(

&profile_, prerender_tracker())),

prerender_link_manager_(

new PrerenderLinkManager(prerender_manager_.get())),

@@ -346,8 +347,9 @@

}

// Needed to pass PrerenderManager's DCHECKs.

- content::TestBrowserThreadBundle thread_bundle_;

TestingProfile profile_;

+ base::MessageLoop message_loop_;

+ content::TestBrowserThread ui_thread_;

scoped_ptr<UnitTestPrerenderManager> prerender_manager_;

scoped_ptr<PrerenderLinkManager> prerender_link_manager_;

int last_prerender_id_;