Remove deprecated things from net test suite:

chrome/browser/browser_keyevents_browsertest.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
 namespace {
 
-const wchar_t kTestingPage[] = L"files/keyevents_test.html";
+const char kTestingPage[] = "files/keyevents_test.html";
 const wchar_t kSuppressEventJS[] =
     L"window.domAutomationController.send(setDefaultAction('%ls', %ls));";
 const wchar_t kGetResultJS[] =
     L"window.domAutomationController.send(keyEventResult[%d]);";
 const wchar_t kGetResultLengthJS[] =
     L"window.domAutomationController.send(keyEventResult.length);";
 const wchar_t kGetFocusedElementJS[] =
     L"window.domAutomationController.send(focusedElement);";
 const wchar_t kSetFocusedElementJS[] =
     L"window.domAutomationController.send(setFocusedElement('%ls'));";
@@ skipping 301 matching lines @@
     { base::VKEY_A, false, false, false,
       false, false, false, true, 4,
       { "D 65 0 false false false",
         "P 97 97 false false false",
         "T a",
         "U 65 0 false false false" } },
   };
 
   HTTPTestServer* server = StartHTTPServer();
 
-  GURL url = server->TestServerPageW(kTestingPage);
+  GURL url = server->TestServerPage(kTestingPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   int tab_index = browser()->selected_index();
   for (size_t i = 0; i < arraysize(kTestNoInput); ++i) {
     EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestNoInput[i]))
         << "kTestNoInput[" << i << "] failed:\n"
         << GetTestDataDescription(kTestNoInput[i]);
@@ skipping 53 matching lines @@
     false, false, false, false, 5,
     { "D 17 0 true false false",
       "D 13 0 true false false",
       "P 10 10 true false false",
       "U 13 0 true false false",
       "U 17 0 true false false" }
   };
 
   HTTPTestServer* server = StartHTTPServer();
 
-  GURL url = server->TestServerPageW(kTestingPage);
+  GURL url = server->TestServerPage(kTestingPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   int tab_index = browser()->selected_index();
   // Press Ctrl+F, which will make the Find box open and request focus.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlF));
   EXPECT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
@@ skipping 47 matching lines @@
     base::VKEY_1, false, false, true,
     false, false, false, false, 4,
     { "D 18 0 false false true",
       "D 49 0 false false true",
       "U 49 0 false false true",
       "U 18 0 false false true" }
   };
 
   HTTPTestServer* server = StartHTTPServer();
 
-  GURL url = server->TestServerPageW(kTestingPage);
+  GURL url = server->TestServerPage(kTestingPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   ui_test_utils::RunAllPendingInMessageLoop();
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   int tab_index = browser()->selected_index();
   // Make sure no element is focused.
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L""));
   // Alt+A should focus the element with accesskey = "A".
@@ skipping 34 matching lines @@
   // not be used as accesskeys.
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L""));
 #elif defined(OS_WIN)
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"1"));
 #endif
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, ReservedAccelerators) {
   HTTPTestServer* server = StartHTTPServer();
 
-  GURL url = server->TestServerPageW(kTestingPage);
+  GURL url = server->TestServerPage(kTestingPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
 #if defined(OS_WIN)
   static const KeyEventTestData kTestCtrlT = {
     base::VKEY_T, true, false, false,
     true, false, false, false, 1,
     { "D 17 0 true false false" }
@@ skipping 81 matching lines @@
   ASSERT_EQ(0, browser()->selected_index());
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlWBlocked));
   ASSERT_EQ(2, browser()->tab_count());
 
   // Ctrl+F4 to close the tab.
   ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true));
   ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_F4, true, false, false));
   ASSERT_EQ(1, browser()->tab_count());
 #endif
 }