Revert 7508.7509 and 7510

chrome/test/ui/inspector_controller_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 "base/command_line.h"
 #include "base/no_windows2000_unittest.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 19 matching lines @@
 
 // This test also does not work in single process. See http://b/1214920
 // Disabled, see http://crbug.com/4655
 TEST_F(InspectorControllerTest, DISABLED_InspectElement) {
   if (IsTestCaseDisabled())
     return;
 
   if (CommandLine().HasSwitch(switches::kSingleProcess))
     return;
 
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(L"chrome/test/data");
-  ASSERT_TRUE(NULL != server.get());
-
+  TestServer server(L"chrome/test/data");
   ::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   // We don't track resources until we've opened the inspector.
-  NavigateTab(tab.get(), server->TestServerPageW(
-      L"files/inspector/test1.html"));
+  NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test1.html"));
   tab->InspectElement(0, 0);
-  NavigateTab(tab.get(), server->TestServerPageW(
-      L"files/inspector/test1.html"));
+  NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test1.html"));
   EXPECT_EQ(1, tab->InspectElement(0, 0));
-  NavigateTab(tab.get(), server->TestServerPageW(
-      L"files/inspector/test2.html"));
+  NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test2.html"));
   EXPECT_EQ(2, tab->InspectElement(0, 0));
 }