Revert 7508.7509 and 7510

chrome/browser/browser_focus_uitest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/view_ids.h"
 #include "chrome/views/view.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 37 matching lines @@
 
   // Wait a bit to let the click be processed.
   ::Sleep(kActionDelayMs);
 
   return true;
 }
 
 }  // namespace
 
 TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // 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));
 
   // The focus should be on the Tab contents.
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
 
   scoped_ptr<BrowserProxy> browser(automation()->
       GetBrowserForWindow(window.get()));
   ASSERT_TRUE(browser.get() != NULL);
@@ skipping 51 matching lines @@
   // Switch back to the second browser, focus should still be on the page.
   EXPECT_TRUE(new_window->Activate());
   EXPECT_TRUE(new_window->GetFocusedViewID(&focused_view_id));
   EXPECT_EQ(VIEW_ID_TAB_CONTAINER, focused_view_id);
   EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id));
   EXPECT_EQ(-1, focused_view_id);
 }
 
 // Tabs remember focus.
 TEST_F(BrowserFocusTest, TabsRememberFocus) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
   scoped_ptr<BrowserProxy> browser(
       automation()->GetBrowserForWindow(window.get()));
   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);
 
   // Create several tabs.
   EXPECT_TRUE(browser->AppendTab(url));
   EXPECT_TRUE(browser->AppendTab(url));
   EXPECT_TRUE(browser->AppendTab(url));
   EXPECT_TRUE(browser->AppendTab(url));
 
   int tab_count;
@@ skipping 34 matching lines @@
                                            VIEW_ID_LOCATION_BAR;
       int focused_view_id;
       EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id));
       EXPECT_EQ(exp_view_id, focused_view_id);
     }
   }
 }
 
 // Background window does not steal focus.
 TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // 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);
 
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
   scoped_ptr<BrowserProxy> browser(
       automation()->GetBrowserForWindow(window.get()));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Open a new browser window.
   EXPECT_TRUE(automation()->OpenNewBrowserWindow(SW_SHOWNORMAL));
   scoped_ptr<WindowProxy> new_window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
   scoped_ptr<BrowserProxy> new_browser(
       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
   EXPECT_TRUE(window->Activate());
 
   // Wait for the focus to be stolen by the other browser.
   ::Sleep(2000);
 
   // Make sure the 1st browser window is still active.
   bool is_active = false;
   EXPECT_TRUE(window->IsActive(&is_active));
   EXPECT_TRUE(is_active);
 }
 
 // Page cannot steal focus when focus is on location bar.
 TEST_F(BrowserFocusTest, LocationBarLockFocus) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // Open the page that steals focus.
-  GURL url = server->TestServerPageW(kStealFocusPage);
+  GURL url = server.TestServerPageW(kStealFocusPage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(url);
 
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
   scoped_ptr<BrowserProxy> browser(
       automation()->GetBrowserForWindow(window.get()));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Click on the location bar.
   gfx::Rect bounds;
   EXPECT_TRUE(window->GetViewBounds(VIEW_ID_LOCATION_BAR, &bounds, true));
   POINT click(bounds.CenterPoint().ToPOINT());
   EXPECT_TRUE(window->SimulateOSClick(click,
       views::Event::EF_LEFT_BUTTON_DOWN));
   ::Sleep(kActionDelayMs);
 
   // Wait for the page to steal focus.
   ::Sleep(2000);
 
   // Make sure the location bar is still focused.
   int focused_view_id;
   EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id));
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, focused_view_id);
 }
 
 // Focus traversal
 TEST_F(BrowserFocusTest, FocusTraversal) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // Open the page the test page.
-  GURL url = server->TestServerPageW(kTypicalPage);
+  GURL url = server.TestServerPageW(kTypicalPage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   tab->NavigateToURL(url);
 
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
   scoped_ptr<BrowserProxy> browser(
     automation()->GetBrowserForWindow(window.get()));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Click on the location bar.
@@ skipping 49 matching lines @@
       ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
           L"window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[6 - j], actual.c_str());
     }
   }
 }
 
 // Make sure Find box can request focus, even when it is already open.
 TEST_F(BrowserFocusTest, FindFocusTest) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // 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);
 
   scoped_ptr<WindowProxy> window(automation()->GetActiveWindow());
   ASSERT_TRUE(window.get() != NULL);
   scoped_ptr<BrowserProxy> browser(
       automation()->GetBrowserForWindow(window.get()));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Press Ctrl+F, which will make the Find box open and request focus.
@@ skipping 29 matching lines @@
   ::Sleep(kActionDelayMs);
   EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id));
   EXPECT_EQ(VIEW_ID_TAB_CONTAINER, focused_view_id);
 
   // Now press Ctrl+F again and focus should move to the Find box.
   EXPECT_TRUE(window->SimulateOSKeyPress(VK_F, views::Event::EF_CONTROL_DOWN));
   ::Sleep(kActionDelayMs);
   EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id));
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, focused_view_id);
 }