chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc - Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

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: chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merged ToT Created 7 years, 6 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 | « chrome/browser/extensions/activity_log/activity_log_unittest.cc ('k') | chrome/browser/extensions/api/identity/experimental_web_auth_flow_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc

diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc

index 8752da2d34ec4c1d04d1814ba7c79e0e9477b9bd..f5fc66c8261536e0742e3827d171f740369433bd 100644

--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc

+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc

@@ -22,7 +22,7 @@

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_test_util.h"

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

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

#include "net/http/http_response_headers.h"

#include "net/url_request/url_request_test_util.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -71,7 +71,7 @@ namespace keys = declarative_webrequest_constants;

class WebRequestActionWithThreadsTest : public testing::Test {

public:

WebRequestActionWithThreadsTest()

- : io_thread_(content::BrowserThread::IO, &message_loop_) {}

+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}

protected:

virtual void SetUp() OVERRIDE;

@@ -99,8 +99,7 @@ class WebRequestActionWithThreadsTest : public testing::Test {

scoped_refptr<ExtensionInfoMap> extension_info_map_;

private:

- base::MessageLoopForIO message_loop_;

- content::TestBrowserThread io_thread_;

+ content::TestBrowserThreadBundle thread_bundle_;

};

void WebRequestActionWithThreadsTest::SetUp() {