summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_keyevents_browsertest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 07:17:30 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 07:17:30 +0000
commitf72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236 (patch)
treee915476e6da96eb67e56e6ea63c8d05a4280cbee /chrome/browser/browser_keyevents_browsertest.cc
parent7e868c9633b4d6f41c8d559625b69ef9fece5b8b (diff)
downloadchromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.zip
chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.tar.gz
chromium_src-f72a1ccce08050ede3d1e46cbbcd9cf5b3a1c236.tar.bz2
Remove deprecated things from net test suite:
- URLRequestTestContext (from now on use TestURLRequestContext) - TestServerPageW (use TestServerPage). TEST=none BUG=none Review URL: http://codereview.chromium.org/1814002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_keyevents_browsertest.cc')
-rw-r--r--chrome/browser/browser_keyevents_browsertest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 227f77f..f38230d 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -27,7 +27,7 @@
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[] =
@@ -351,7 +351,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) {
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));
@@ -425,7 +425,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) {
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));
@@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
HTTPTestServer* server = StartHTTPServer();
- GURL url = server->TestServerPageW(kTestingPage);
+ GURL url = server->TestServerPage(kTestingPage);
ui_test_utils::NavigateToURL(browser(), url);
ui_test_utils::RunAllPendingInMessageLoop();
@@ -548,7 +548,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
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));