1 files changed, 25 insertions, 13 deletions

diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index ca89162..160c3ab 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -55,10 +55,12 @@ bool ActivateTabByClick(AutomationProxy* automation,
 }  // namespace
 
 TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
-  TestServer server(kDocRoot);
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(kDocRoot);
+  ASSERT_TRUE(NULL != server.get());
 
   // First we navigate to our test page.
-  GURL url = server.TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPageW(kSimplePage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   EXPECT_NE(AUTOMATION_MSG_NAVIGATION_ERROR, tab->NavigateToURL(url));
 
@@ -130,7 +132,9 @@ TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
 
 // Tabs remember focus.
 TEST_F(BrowserFocusTest, TabsRememberFocus) {
-  TestServer server(kDocRoot);
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(kDocRoot);
+  ASSERT_TRUE(NULL != server.get());
 
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
@@ -139,7 +143,7 @@ TEST_F(BrowserFocusTest, TabsRememberFocus) {
   ASSERT_TRUE(browser.get() != NULL);
 
   // First we navigate to our test page.
-  GURL url = server.TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPageW(kSimplePage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(url);
 
@@ -194,10 +198,12 @@ TEST_F(BrowserFocusTest, TabsRememberFocus) {
 
 // Background window does not steal focus.
 TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
-  TestServer server(kDocRoot);
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(kDocRoot);
+  ASSERT_TRUE(NULL != server.get());
 
   // First we navigate to our test page.
-  GURL simple_page_url = server.TestServerPageW(kSimplePage);
+  GURL simple_page_url = server->TestServerPageW(kSimplePage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(simple_page_url);
 
@@ -215,7 +221,7 @@ TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
       automation()->GetBrowserForWindow(new_window.get()));
   ASSERT_TRUE(new_browser.get() != NULL);
 
-  GURL steal_focus_url = server.TestServerPageW(kStealFocusPage);
+  GURL steal_focus_url = server->TestServerPageW(kStealFocusPage);
   new_browser->AppendTab(steal_focus_url);
 
   // Make the first browser active
@@ -232,10 +238,12 @@ TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
 
 // Page cannot steal focus when focus is on location bar.
 TEST_F(BrowserFocusTest, LocationBarLockFocus) {
-  TestServer server(kDocRoot);
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(kDocRoot);
+  ASSERT_TRUE(NULL != server.get());
 
   // Open the page that steals focus.
-  GURL url = server.TestServerPageW(kStealFocusPage);
+  GURL url = server->TestServerPageW(kStealFocusPage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(url);
 
@@ -264,10 +272,12 @@ TEST_F(BrowserFocusTest, LocationBarLockFocus) {
 
 // Focus traversal
 TEST_F(BrowserFocusTest, FocusTraversal) {
-  TestServer server(kDocRoot);
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(kDocRoot);
+  ASSERT_TRUE(NULL != server.get());
 
   // Open the page the test page.
-  GURL url = server.TestServerPageW(kTypicalPage);
+  GURL url = server->TestServerPageW(kTypicalPage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(url);
 
@@ -337,10 +347,12 @@ TEST_F(BrowserFocusTest, FocusTraversal) {
 
 // Make sure Find box can request focus, even when it is already open.
 TEST_F(BrowserFocusTest, FindFocusTest) {
-  TestServer server(kDocRoot);
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(kDocRoot);
+  ASSERT_TRUE(NULL != server.get());
 
   // Open some page (any page that doesn't steal focus).
-  GURL url = server.TestServerPageW(kTypicalPage);
+  GURL url = server->TestServerPageW(kTypicalPage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(url);