Revert 7508.7509 and 7510

chrome/common/chrome_plugin_unittest.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.
 // Tests exercising the Chrome Plugin API.
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/browser/profile.h"
@@ skipping 240 matching lines @@
 
   // Note: we must add this task after we make the request, so that
   // URLRequestTestJob's StartAsync task is added and run first.
   MessageLoop::current()->PostTask(FROM_HERE,
       NewRunnableFunction(&ProcessAllPendingMessages));
   MessageLoop::current()->Run();
 }
 
 // Tests that the plugin can issue a POST request.
 TEST_F(ChromePluginTest, CanMakePOSTRequest) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-
-  GURL url = server->TestServerPage("echo");
+  TestServer server(kDocRoot);
+  GURL url = server.TestServerPage("echo");
 
   EXPECT_EQ(CPERR_SUCCESS, test_funcs_.test_make_request("POST", url));
 
   // Note: we must add this task after we make the request, so that
   // URLRequestTestJob's StartAsync task is added and run first.
   MessageLoop::current()->PostTask(FROM_HERE,
       NewRunnableFunction(&ProcessAllPendingMessages));
   MessageLoop::current()->Run();
 }
 
 // Tests that the plugin does not intercept its own requests.
 TEST_F(ChromePluginTest, DoesNotInterceptOwnRequest) {
   const TestResponsePayload& payload = kChromeTestPluginPayloads[0];
 
   EXPECT_EQ(CPERR_SUCCESS, test_funcs_.test_make_request(
       "GET", GURL(payload.url)));
 
   MessageLoop::current()->Run();
 }