summaryrefslogtreecommitdiffstats
path: root/content/test/content_browser_test.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 15:52:15 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 15:52:15 +0000
commitaae3406d662a2a3278f7b180135ecc9a939a99b1 (patch)
treef44206dac1a93d960b1ce84fe4e050d9f5131f02 /content/test/content_browser_test.cc
parente82e4f4861eaba64e49c26a4d2b0f52af674bc13 (diff)
downloadchromium_src-aae3406d662a2a3278f7b180135ecc9a939a99b1.zip
chromium_src-aae3406d662a2a3278f7b180135ecc9a939a99b1.tar.gz
chromium_src-aae3406d662a2a3278f7b180135ecc9a939a99b1.tar.bz2
Use a temp dir for the BrowserContext when content_shell is running as a browser_test.
BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10815002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.cc')
-rw-r--r--content/test/content_browser_test.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index 9eb5c63..a863d65 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -13,6 +13,7 @@
#include "content/public/common/content_switches.h"
#include "content/shell/shell.h"
#include "content/shell/shell_main_delegate.h"
+#include "content/shell/shell_switches.h"
#include "content/test/test_content_client.h"
#if defined(OS_MACOSX)
@@ -38,9 +39,11 @@ void ContentBrowserTest::SetUp() {
shell_main_delegate_.reset(new ShellMainDelegate);
shell_main_delegate_->PreSandboxStartup();
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ command_line->AppendSwitch(switches::kContentBrowserTest);
+
#if defined(OS_MACOSX)
// See InProcessBrowserTest::PrepareTestCommandLine().
- CommandLine* command_line = CommandLine::ForCurrentProcess();
FilePath subprocess_path;
PathService::Get(base::FILE_EXE, &subprocess_path);
subprocess_path = subprocess_path.DirName().DirName();