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-07-29 21:44:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
commit3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch)
treeaa092101b582f5a9973fc68cce625834a9436c86 /chrome/browser/browser_keyevents_browsertest.cc
parent4ada238a76785ee78396cfb8e5992044c302de1e (diff)
downloadchromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.zip
chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.gz
chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.bz2
GTTF: Move more test server code from net/url_request/url_request_unittest.h
to net/test/test_server.h No code changes, just a move. TEST=none BUG=49680 Review URL: http://codereview.chromium.org/3034038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_keyevents_browsertest.cc')
-rw-r--r--chrome/browser/browser_keyevents_browsertest.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 9c7ef65..e943bef 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -24,6 +24,7 @@
#include "chrome/common/notification_service.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
+#include "net/test/test_server.h"
namespace {
@@ -373,7 +374,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) {
"U 65 0 false false false false" } },
};
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();
@@ -459,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) {
"U 17 0 true false false false" }
};
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();
@@ -505,7 +506,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CommandKeyEvents) {
"U 91 0 false false false true" }
};
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();
@@ -609,7 +610,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
};
#endif
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();
@@ -677,7 +678,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
#endif
IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) {
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();
@@ -835,7 +836,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, EditorKeyBindings) {
"U 17 0 true false false false" }
};
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();
@@ -873,7 +874,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, PageUpDownKeys) {
"U 34 0 false false false false" }
};
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
BringBrowserWindowToFront();