- Fix command line parsing for reliability_tests.

- Disable usage 1 when reliability_tests runs as a stand alone
  progtram. Usage 1 is used in ui test suite on buildbot to
  ensure reliability_tests run as intended.

Review URL: http://codereview.chromium.org/16816

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8433 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 2 deletions

diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index b451006..2ee9470 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -101,6 +101,7 @@ uint32 timeout_ms = INFINITE;
 bool save_debug_log = false;
 std::wstring chrome_log_path;
 std::wstring v8_log_path;
+bool stand_alone = false;
 
 class PageLoadTest : public UITest {
  public:
@@ -266,7 +267,10 @@ class PageLoadTest : public UITest {
       }
     } else {
       // Don't run if single process mode.
-      if (in_process_renderer())
+      // Also don't run if running as a standalone program which is for
+      // distributed testing, to avoid mistakenly hitting web sites with many
+      // instances.
+      if (in_process_renderer() || stand_alone)
         return;
       // For usage 1
       NavigationMetrics metrics;
@@ -554,6 +558,8 @@ TEST_F(PageLoadTest, Reliability) {
 }
 
 void SetPageRange(const CommandLine& parsed_command_line) {
+  // If calling into this function, we are running as a standalone program.
+  stand_alone = true;
   if (parsed_command_line.HasSwitch(kStartPageSwitch)) {
     ASSERT_TRUE(parsed_command_line.HasSwitch(kEndPageSwitch));
     start_page =
diff --git a/chrome/test/reliability/reliability_test_suite.h b/chrome/test/reliability/reliability_test_suite.h
index 809ca52..cf1d88f 100644
--- a/chrome/test/reliability/reliability_test_suite.h
+++ b/chrome/test/reliability/reliability_test_suite.h
@@ -18,7 +18,7 @@ protected:
   virtual void Initialize() {
     UITestSuite::Initialize();
 
-    SetPageRange(CommandLine(L""));
+    SetPageRange(*CommandLine::ForCurrentProcess());
   }
 };