From 3985ba8a1d1e396d98c4dbec84077d6a67109db9 Mon Sep 17 00:00:00 2001
From: "phajdan.jr@chromium.org"
<phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 29 Jul 2010 21:44:12 +0000
Subject: 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
---
chrome/browser/browser_focus_uitest.cc | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
(limited to 'chrome/browser/browser_focus_uitest.cc')
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 1e0f2fc..aa79385 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -4,9 +4,11 @@
#include "build/build_config.h"
+#include "base/file_util.h"
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/message_loop.h"
+#include "base/path_service.h"
#include "base/ref_counted.h"
#include "chrome/browser/automation/ui_controls.h"
#include "chrome/browser/browser.h"
@@ -20,6 +22,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
+#include "net/test/test_server.h"
#if defined(TOOLKIT_VIEWS) || defined(OS_WIN)
#include "views/focus/focus_manager.h"
@@ -182,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) {
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -247,7 +250,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
// Tabs remember focus.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -323,7 +326,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) {
// Tabs remember focus with find-in-page box.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -363,7 +366,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) {
// Background window does not steal focus.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -420,7 +423,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
// Page cannot steal focus when focus is on location bar.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// Open the page that steals focus.
@@ -443,7 +446,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
// RenderWidget::didFocus()).
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -537,7 +540,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
// Focus traversal while an interstitial is showing.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -629,7 +632,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
// Focus stays on page with interstitials.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// First we navigate to our test page.
@@ -666,7 +669,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
// Make sure Find box can request focus, even when it is already open.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// Open some page (any page that doesn't steal focus).
@@ -767,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) {
// Tests that focus goes where expected when using reload.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// Open the new tab, reload.
@@ -802,7 +805,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
// Tests that focus goes where expected when using reload on a crashed tab.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusOnReloadCrashedTab) {
BringBrowserWindowToFront();
- HTTPTestServer* server = StartHTTPServer();
+ net::HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
// Open a regular page, crash, reload.
--
cgit v1.1