Revert "Remove GetSwitchValue() from chrome/* where easy."

This reverts commit r54966.

Meant to try it, not commit it, sorry everyone.  :(

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

1 files changed, 17 insertions, 21 deletions

diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index 4c77378..abf83ca 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -628,13 +628,11 @@ void SetPageRange(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(kStartPageSwitch)) {
     ASSERT_TRUE(parsed_command_line.HasSwitch(kEndPageSwitch));
     ASSERT_TRUE(
-        base::StringToInt(parsed_command_line.GetSwitchValueASCII(
-                              kStartPageSwitch),
-                          &g_start_page));
+        base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+            kStartPageSwitch)), &g_start_page));
     ASSERT_TRUE(
-        base::StringToInt(parsed_command_line.GetSwitchValueASCII(
-                              kEndPageSwitch),
-                          &g_end_page));
+        base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+            kEndPageSwitch)), &g_end_page));
     ASSERT_TRUE(g_start_page > 0 && g_end_page > 0);
     ASSERT_TRUE(g_start_page < g_end_page);
     g_append_page_id = true;
@@ -643,22 +641,20 @@ void SetPageRange(const CommandLine& parsed_command_line) {
   }
 
   if (parsed_command_line.HasSwitch(kSiteSwitch)) {
-    g_server_url = parsed_command_line.GetSwitchValueASCII(kSiteSwitch);
+    g_server_url = WideToUTF8(parsed_command_line.GetSwitchValue(kSiteSwitch));
   }
 
   if (parsed_command_line.HasSwitch(kStartIndexSwitch)) {
     ASSERT_TRUE(
-        base::StringToInt(parsed_command_line.GetSwitchValueASCII(
-                              kStartIndexSwitch),
-                          &g_start_index));
+        base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+            kStartIndexSwitch)), &g_start_index));
     ASSERT_GT(g_start_index, 0);
   }
 
   if (parsed_command_line.HasSwitch(kEndIndexSwitch)) {
     ASSERT_TRUE(
-        base::StringToInt(parsed_command_line.GetSwitchValueASCII(
-                              kEndIndexSwitch),
-                          &g_end_index));
+        base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+            kEndIndexSwitch)), &g_end_index));
     ASSERT_GT(g_end_index, 0);
   }
 
@@ -669,9 +665,8 @@ void SetPageRange(const CommandLine& parsed_command_line) {
 
   if (parsed_command_line.HasSwitch(kIterationSwitch)) {
     ASSERT_TRUE(
-        base::StringToInt(parsed_command_line.GetSwitchValueASCII(
-                              kIterationSwitch),
-                          &g_iterations));
+        base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+            kIterationSwitch)), &g_iterations));
     ASSERT_GT(g_iterations, 0);
   }
 
@@ -681,17 +676,18 @@ void SetPageRange(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(kContinuousLoadSwitch))
     g_continuous_load = true;
 
-  if (parsed_command_line.HasSwitch(kEndURLSwitch))
-    g_end_url = parsed_command_line.GetSwitchValueASCII(kEndURLSwitch);
+  if (parsed_command_line.HasSwitch(kEndURLSwitch)) {
+    g_end_url = WideToUTF8(
+        parsed_command_line.GetSwitchValue(kEndURLSwitch));
+  }
 
   if (parsed_command_line.HasSwitch(kLogFileSwitch))
     g_log_file_path = parsed_command_line.GetSwitchValuePath(kLogFileSwitch);
 
   if (parsed_command_line.HasSwitch(kTimeoutSwitch)) {
     ASSERT_TRUE(
-        base::StringToInt(parsed_command_line.GetSwitchValueASCII(
-                              kTimeoutSwitch),
-                          &g_timeout_ms));
+        base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+            kTimeoutSwitch)), &g_timeout_ms));
     ASSERT_GT(g_timeout_ms, 0);
   }