chrome/browser/media_galleries/media_galleries_test_util.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/media_galleries/media_galleries_test_util.cc

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

Patch Set: merge to head, address jyasskin's comments. Created 7 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

« chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc ('K') | « chrome/browser/media_galleries/media_file_system_registry_unittest.cc ('k') | chrome/browser/notifications/desktop_notification_service_unittest.cc » ('j') | content/browser/browser_thread_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_test_util.cc

diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc

index 97afbf36416c0734848adec14a72865d066b2b54..9789c4d9111d4d5da9da21c60318bbff1b41d722 100644

--- a/chrome/browser/media_galleries/media_galleries_test_util.cc

+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc

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

#include "base/file_util.h"

#include "base/files/file_path.h"

#include "base/path_service.h"

+#include "base/string_util.h"

#include "base/stringprintf.h"

#include "chrome/browser/extensions/extension_prefs.h"

#include "chrome/browser/extensions/extension_service.h"

@@ -77,6 +78,13 @@ void EnsureMediaDirectoriesExists::Init() {

#else

ASSERT_TRUE(fake_dir_.CreateUniqueTempDir());

+#if defined(OS_WIN)

+ DCHECK_EQ(0U, fake_dir_.path().value().find(FILE_PATH_LITERAL("C:")))

+ << "TestVolumeMountWatcherWin requries fake_dir to be on C: "

+ << "(note the capital). You have: " << fake_dir_.path().AsUTF8Unsafe()

+ << ". Check your TMP enviornment variable.";

+#endif

const int kDirectoryKeys[] = {

chrome::DIR_USER_MUSIC,

chrome::DIR_USER_PICTURES,