summaryrefslogtreecommitdiffstats
path: root/chrome/test/in_process_browser_test.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 18:59:20 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 18:59:20 +0000
commit986088a69b2481d425d67d1e11cd79c1df11860d (patch)
tree6992623b125cedadf6d1b2a6f4fa4c1912463415 /chrome/test/in_process_browser_test.cc
parentd6fb67d13717c96a852e95d9942915947c1c96c1 (diff)
downloadchromium_src-986088a69b2481d425d67d1e11cd79c1df11860d.zip
chromium_src-986088a69b2481d425d67d1e11cd79c1df11860d.tar.gz
chromium_src-986088a69b2481d425d67d1e11cd79c1df11860d.tar.bz2
Remove EnableSingleProcess() since it's unused. Improve comments and user help documentation.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2071002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
-rw-r--r--chrome/test/in_process_browser_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 0f377d3..21bf2a6 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -78,7 +78,6 @@ InProcessBrowserTest::InProcessBrowserTest()
: browser_(NULL),
show_window_(false),
dom_automation_enabled_(false),
- single_process_(false),
original_single_process_(false),
initial_timeout_(kInitialTimeoutInMS) {
}
@@ -108,6 +107,10 @@ void InProcessBrowserTest::SetUp() {
// bundle we'll crash.
browser_shutdown::delete_resources_on_shutdown = false;
+ // Remember the command line. Normally this doesn't matter, because the test
+ // harness creates a new process for each test, but when the test harness is
+ // running in single process mode, we can't let one test's command-line
+ // changes (e.g. enabling DOM automation) affect other tests.
CommandLine* command_line = CommandLine::ForCurrentProcessMutable();
original_command_line_.reset(new CommandLine(*command_line));
@@ -122,9 +125,6 @@ void InProcessBrowserTest::SetUp() {
if (dom_automation_enabled_)
command_line->AppendSwitch(switches::kDomAutomationController);
- if (single_process_)
- command_line->AppendSwitch(switches::kSingleProcess);
-
// Turn off tip loading for tests; see http://crbug.com/17725
command_line->AppendSwitch(switches::kDisableWebResources);