Revert 7508.7509 and 7510

chrome/browser/views/find_bar_win_interactive_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"
@@ skipping 34 matching lines @@
 
   // Wait a bit to let the click be processed.
   ::Sleep(kActionDelayMs);
 
   return true;
 }
 
 }  // namespace
 
 TEST_F(FindInPageTest, CrashEscHandlers) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
   ASSERT_TRUE(browser.get() != NULL);
   scoped_ptr<WindowProxy> window(
       automation()->GetWindowForBrowser(browser.get()));
   ASSERT_TRUE(window.get() != NULL);
 
   // First we navigate to our test page (tab A).
-  GURL url = server->TestServerPageW(kSimplePage);
+  GURL url = server.TestServerPageW(kSimplePage);
   scoped_ptr<TabProxy> tabA(GetActiveTab());
   EXPECT_NE(AUTOMATION_MSG_NAVIGATION_ERROR, tabA->NavigateToURL(url));
 
   EXPECT_TRUE(tabA->OpenFindInPage());
 
   // Open another tab (tab B).
   EXPECT_TRUE(browser->AppendTab(url));
   scoped_ptr<TabProxy> tabB(GetActiveTab());
 
   EXPECT_TRUE(tabB->OpenFindInPage());
@@ skipping 12 matching lines @@
                                       views::Event::EF_LEFT_BUTTON_DOWN));
   ::Sleep(kActionDelayMs);
   int focused_view_id;
   EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id));
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, focused_view_id);
 
   // This used to crash until bug 1303709 was fixed.
   EXPECT_TRUE(window->SimulateOSKeyPress(VK_ESCAPE, 0));
   ::Sleep(kActionDelayMs);
 }