Revert 7508.7509 and 7510

chrome/test/ui/inspector_controller_uitest.cc

Index: chrome/test/ui/inspector_controller_uitest.cc
===================================================================
--- chrome/test/ui/inspector_controller_uitest.cc	(revision 7513)
+++ chrome/test/ui/inspector_controller_uitest.cc	(working copy)
@@ -37,20 +37,14 @@
   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));
 }