Don't let users set the number of cycles to be more than kNumCyclesMax in startup_tests.

BUG=none
TEST=Setting STARTUP_TESTS_NUMCYCLES to 200 doesn't crash the test.
Review URL: http://codereview.chromium.org/1652010

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

2 files changed, 20 insertions, 4 deletions

diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc
index 902db3b..bd739fb 100644
--- a/chrome/test/startup/shutdown_test.cc
+++ b/chrome/test/startup/shutdown_test.cc
@@ -58,8 +58,16 @@ class ShutdownTest : public UITest {
     std::string numCyclesEnv;
     if (env->GetEnv(env_vars::kStartupTestsNumCycles, &numCyclesEnv) &&
         StringToInt(numCyclesEnv, &numCycles)) {
-      LOG(INFO) << env_vars::kStartupTestsNumCycles << " set in environment, "
-                << "so setting numCycles to " << numCycles;
+      if (numCycles <= kNumCyclesMax) {
+        LOG(INFO) << env_vars::kStartupTestsNumCycles
+                  << " set in environment, so setting numCycles to "
+                  << numCycles;
+      } else {
+        LOG(INFO) << env_vars::kStartupTestsNumCycles
+                  << " is higher than the max, setting numCycles to "
+                  << kNumCyclesMax;
+        numCycles = kNumCyclesMax;
+      }
     }
 
     TimeDelta timings[kNumCyclesMax];
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index ff9ec7e..e1aa8c9 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -70,8 +70,16 @@ class StartupTest : public UITest {
     std::string numCyclesEnv;
     if (env->GetEnv(env_vars::kStartupTestsNumCycles, &numCyclesEnv) &&
         StringToInt(numCyclesEnv, &numCycles)) {
-      LOG(INFO) << env_vars::kStartupTestsNumCycles << " set in environment, "
-                << "so setting numCycles to " << numCycles;
+      if (numCycles <= kNumCyclesMax) {
+        LOG(INFO) << env_vars::kStartupTestsNumCycles
+                  << " set in environment, so setting numCycles to "
+                  << numCycles;
+      } else {
+        LOG(INFO) << env_vars::kStartupTestsNumCycles
+                  << " is higher than the max, setting numCycles to "
+                  << kNumCyclesMax;
+        numCycles = kNumCyclesMax;
+      }
     }
 
     TimeDelta timings[kNumCyclesMax];