Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5052)

Unified Diff: chrome/browser/views/find_bar_host_interactive_uitest.cc

Issue 3034038: GTTF: Move more test server code from net/url_request/url_request_unittest.h (Closed)
Patch Set: hopefully final Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | chrome/browser/views/find_bar_host_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/find_bar_host_interactive_uitest.cc
diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc
index 82e09873033320f4550e267a2ab2cfb55450169f..8c04ab7b5b76bdfe86acc921a2be6be0c92c45b4 100644
--- a/chrome/browser/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_host_interactive_uitest.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/view_ids.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
#include "views/focus/focus_manager.h"
#include "views/view.h"
@@ -87,7 +87,7 @@ class FindInPageTest : public InProcessBrowserTest {
} // namespace
IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+ scoped_refptr<net::HTTPTestServer> server(net::HTTPTestServer::CreateServer(kDocRoot));
ASSERT_TRUE(NULL != server.get());
// First we navigate to our test page (tab A).
@@ -124,7 +124,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
}
IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) {
- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+ scoped_refptr<net::HTTPTestServer> server(net::HTTPTestServer::CreateServer(kDocRoot));
ASSERT_TRUE(NULL != server.get());
GURL url = server->TestServerPage("title1.html");
@@ -173,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
return;
#endif
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to any page.
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | chrome/browser/views/find_bar_host_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698