Porting refactoring changes:...

chrome/test/automated_ui_tests/automated_ui_tests.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <fstream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/rand_util.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/libxml_utils.h"
-#include "chrome/common/rand_util.h"
 #include "chrome/common/win_util.h"
 #include "chrome/test/automated_ui_tests/automated_ui_tests.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/views/view.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
@@ skipping 387 matching lines @@
   // Get the encoding list that is used to populate the UI (encoding menu)
   const std::vector<int>* encoding_ids =
       CharacterEncoding::GetCurrentDisplayEncodings(
           L"ISO-8859-1,windows-1252", L"");
   DCHECK(encoding_ids);
   DCHECK(!encoding_ids->empty());
   unsigned len = static_cast<unsigned>(encoding_ids->size());
 
   // The vector will contain mostly IDC values for encoding commands plus a few
   // menu separators (0 values). If we hit a separator we just retry.
-  int index = rand_util::RandInt(0, len);
+  int index = base::RandInt(0, len);
   while ((*encoding_ids)[index] == 0) {
-    index = rand_util::RandInt(0, len);
+    index = base::RandInt(0, len);
   }
 
   return RunCommand((*encoding_ids)[index]);
 }
 
 bool AutomatedUITest::CloseActiveTab() {
   bool return_value = false;
   scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
   if (browser.get() == NULL) {
     AddErrorAttribute("browser_window_not_found");
@@ skipping 246 matching lines @@
   DoAction("Options");
   return FuzzyTestDialog(kTestDialogActionsToRun);
 }
 
 bool AutomatedUITest::TestViewPasswords() {
   DoAction("ViewPasswords");
   return FuzzyTestDialog(kTestDialogActionsToRun);
 }
 
 bool AutomatedUITest::ExerciseDialog() {
-  int index = rand_util::RandInt(0, arraysize(kDialogs) - 1);
+  int index = base::RandInt(0, arraysize(kDialogs) - 1);
   return DoAction(kDialogs[index]) && FuzzyTestDialog(kTestDialogActionsToRun);
 }
 
 bool AutomatedUITest::FuzzyTestDialog(int num_actions) {
   bool return_value = true;
 
   for (int i = 0; i < num_actions; i++) {
     // We want to make sure the first action performed on the dialog is not
     // Space or Enter because focus is likely on the Close button. Both Space
     // and Enter would close the dialog without performing more actions. We
     // rely on the fact that those two actions are first in the array and set
     // the lower bound to 2 if i == 0 to skip those two actions.
-    int action_index = rand_util::RandInt(i == 0 ? 2 : 0,
-                                          arraysize(kTestDialogPossibleActions)
-                                          - 1);
+    int action_index = base::RandInt(i == 0 ? 2 : 0,
+                                     arraysize(kTestDialogPossibleActions)
+                                         - 1);
     return_value = return_value &&
                    DoAction(kTestDialogPossibleActions[action_index]);
     if (DidCrash(false))
       break;
   }
   return DoAction("PressEscapeKey") && return_value;
 }
 
 bool AutomatedUITest::ForceCrash() {
   scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
@@ skipping 274 matching lines @@
 }
 
 TEST_F(AutomatedUITest, TheOneAndOnlyTest) {
   CommandLine parsed_command_line;
   if (parsed_command_line.HasSwitch(kReproSwitch))
     RunReproduction();
   else
     RunAutomatedUITest();
 }