chrome/browser/download/chrome_download_manager_delegate_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/download/chrome_download_manager_delegate_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/content_settings/tab_specific_content_settings_unittest.cc ('k') | chrome/browser/download/download_request_limiter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/chrome_download_manager_delegate_unittest.cc

diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc

index bebfad22125429a0d4833c7a1ce87aa93f10b8fb..afa9531dbdc3cc328baa968e34c8a83dad2c16d5 100644

--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc

+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc

@@ -168,18 +168,13 @@ class ChromeDownloadManagerDelegateTest :

TestingPrefServiceSyncable* pref_service_;

base::ScopedTempDir test_download_dir_;

- content::TestBrowserThread ui_thread_;

- content::TestBrowserThread file_thread_;

scoped_ptr<content::MockDownloadManager> download_manager_;

scoped_refptr<TestChromeDownloadManagerDelegate> delegate_;

MockWebContentsDelegate web_contents_delegate_;

};

ChromeDownloadManagerDelegateTest::ChromeDownloadManagerDelegateTest()

- : ChromeRenderViewHostTestHarness(),

- ui_thread_(content::BrowserThread::UI, &message_loop_),

- file_thread_(content::BrowserThread::FILE, &message_loop_),

- download_manager_(new ::testing::NiceMock<content::MockDownloadManager>) {

+ : download_manager_(new ::testing::NiceMock<content::MockDownloadManager>) {

}

void ChromeDownloadManagerDelegateTest::SetUp() {

@@ -196,7 +191,7 @@ void ChromeDownloadManagerDelegateTest::SetUp() {

}

void ChromeDownloadManagerDelegateTest::TearDown() {

- message_loop_.RunUntilIdle();

+ base::RunLoop().RunUntilIdle();

delegate_->Shutdown();

ChromeRenderViewHostTestHarness::TearDown();

}