GTTF: test server cleanup:

chrome/browser/net/connection_tester_unittest.cc

 // Copyright (c) 2010 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/net/connection_tester.h"
 
 #include "net/base/mock_host_resolver.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 70 matching lines @@
   }
 
  protected:
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_;
   ConnectionTesterDelegate test_delegate_;
   MessageLoop message_loop_;
 };
 
 TEST_F(ConnectionTesterTest, RunAllTests) {
   scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateForkingServer(L"net/data/url_request_unittest/");
+      HTTPTestServer::CreateServer(L"net/data/url_request_unittest/");
 
   ConnectionTester tester(&test_delegate_);
 
   // Start the test suite on URL "echoall".
   // TODO(eroman): Is this URL right?
   GURL url = server->TestServerPage("echoall");
   tester.RunAllTests(url);
 
   // Wait for all the tests to complete.
   MessageLoop::current()->Run();
 
   const int kNumExperiments =
       ConnectionTester::PROXY_EXPERIMENT_COUNT *
       ConnectionTester::HOST_RESOLVER_EXPERIMENT_COUNT;
 
   EXPECT_EQ(1, test_delegate_.start_connection_test_suite_count());
   EXPECT_EQ(kNumExperiments,
             test_delegate_.start_connection_test_experiment_count());
   EXPECT_EQ(kNumExperiments,
             test_delegate_.completed_connection_test_experiment_count());
   EXPECT_EQ(1, test_delegate_.completed_connection_test_suite_count());
 }
 
 TEST_F(ConnectionTesterTest, DeleteWhileInProgress) {
   scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateForkingServer(L"net/data/url_request_unittest/");
+      HTTPTestServer::CreateServer(L"net/data/url_request_unittest/");
 
   scoped_ptr<ConnectionTester> tester(new ConnectionTester(&test_delegate_));
 
   // Start the test suite on URL "echoall".
   // TODO(eroman): Is this URL right?
   GURL url = server->TestServerPage("echoall");
   tester->RunAllTests(url);
 
   MessageLoop::current()->RunAllPending();
 
@@ skipping 12 matching lines @@
   // net::ClientSocketPoolBaseHelper, since the "Group" holds a pointer
   // |backup_task| that it will try to deref during the destructor, but
   // depending on the order that pending tasks were deleted in, it might
   // already be invalid! See http://crbug.com/43291.
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   MessageLoop::current()->Run();
 }
 
 }  // namespace