Allow the reliability tests to run more than on URL in JS stress mode

There was i bug in the reliability tests where passing --stress-opt or --stress-deopt would cause the loading of the second URL from the list passed with the --list argument did not wotk. This was not an issur for the reliability test runner as it currently only loads one URL in each test when running in JS stress mode.

Also changed the JS stress message to be a control message.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6538078

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

1 files changed, 12 insertions, 4 deletions

diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index 1d3777d..bed39d3 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -153,6 +153,13 @@ class PageLoadTest : public UITest {
     show_window_ = true;
   }
 
+  void EnsureBrowserAndServer() {
+    if (!g_browser_existing) {
+      LaunchBrowserAndServer();
+      g_browser_existing = true;
+    }
+  }
+
   // Load a URL in a browser tab and perform a couple of page down events.
   //   url_string:      The URL to navigate to. Accept URL as std::string here
   //                    because the url may also act as a test id and needs to
@@ -202,10 +209,8 @@ class PageLoadTest : public UITest {
     test_log << "Test Start: ";
     test_log << base::TimeFormatFriendlyDateAndTime(time_now) << std::endl;
 
-    if (!g_browser_existing) {
-      LaunchBrowserAndServer();
-      g_browser_existing = true;
-    }
+    // Make sure the browser is running.
+    EnsureBrowserAndServer();
 
     // Log Browser Launched time.
     time_now = base::Time::Now();
@@ -470,6 +475,9 @@ class PageLoadTest : public UITest {
 
       if (g_start_index <= line_index) {
         if (g_stress_opt || g_stress_deopt) {
+          // Make sure the browser is running to communicate the stress
+          // setting.
+          EnsureBrowserAndServer();
           v8::Testing::StressType stress_type =
               g_stress_opt
                   ? v8::Testing::kStressTypeOpt