Revert 7508.7509 and 7510

webkit/glue/resource_fetcher_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.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceResponse.h"
@@ skipping 135 matching lines @@
   bool completed_;
   int time_elapsed_ms_;
   ResourceResponse response_;
   std::string data_;
 };
 
 FetcherDelegate* FetcherDelegate::instance_ = NULL;
 
 // Test a fetch from the test server.
 TEST_F(ResourceFetcherTests, ResourceFetcherDownload) {
-  scoped_refptr<UnittestTestServer> server =
-      UnittestTestServer::CreateServer();
-  ASSERT_TRUE(NULL != server.get());
+  UnittestTestServer server;
 
   WebFrame* web_frame = test_shell_->webView()->GetMainFrame();
   // Not safe, but this is a unittest, so whatever.
   WebFrameImpl* web_frame_impl = reinterpret_cast<WebFrameImpl*>(web_frame);
   WebCore::Frame* frame = web_frame_impl->frame();
 
-  GURL url = server->TestServerPage("files/test_shell/index.html");
+  GURL url = server.TestServerPage("files/test_shell/index.html");
   scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
   scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcher(
       url, frame, delegate.get()));
 
   delegate->WaitForResponse();
 
   ASSERT_TRUE(delegate->completed());
   EXPECT_EQ(delegate->response().httpStatusCode(), 200);
   std::string text = delegate->data();
   EXPECT_TRUE(text.find("What is this page?") != std::string::npos);
 
   // Test 404 response.
-  url = server->TestServerPage("files/thisfiledoesntexist.html");
+  url = server.TestServerPage("files/thisfiledoesntexist.html");
   delegate.reset(new FetcherDelegate);
   fetcher.reset(new ResourceFetcher(url, frame, delegate.get()));
 
   delegate->WaitForResponse();
 
   ASSERT_TRUE(delegate->completed());
   EXPECT_EQ(delegate->response().httpStatusCode(), 404);
   EXPECT_TRUE(delegate->data().find("Not Found.") != std::string::npos);
 }
 
 TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) {
-  scoped_refptr<UnittestTestServer> server =
-      UnittestTestServer::CreateServer();
-  ASSERT_TRUE(NULL != server.get());
-
+  UnittestTestServer server;
   WebFrame* web_frame = test_shell_->webView()->GetMainFrame();
   // Not safe, but this is a unittest, so whatever.
   WebFrameImpl* web_frame_impl = reinterpret_cast<WebFrameImpl*>(web_frame);
   WebCore::Frame* frame = web_frame_impl->frame();
 
   // Try to fetch a page on a site that doesn't exist.
   GURL url("http://localhost:1339/doesnotexist");
   scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
   scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcher(
       url, frame, delegate.get()));
 
   delegate->WaitForResponse();
 
   // When we fail, we still call the Delegate callback but we pass in empty
   // values.
   EXPECT_TRUE(delegate->completed());
   EXPECT_TRUE(delegate->response().isNull());
   EXPECT_EQ(delegate->data(), std::string());
   EXPECT_TRUE(delegate->time_elapsed_ms() < kMaxWaitTimeMs);
 }
 
 TEST_F(ResourceFetcherTests, ResourceFetcherTimeout) {
-  scoped_refptr<UnittestTestServer> server =
-      UnittestTestServer::CreateServer();
-  ASSERT_TRUE(NULL != server.get());
+  UnittestTestServer server;
 
   WebFrame* web_frame = test_shell_->webView()->GetMainFrame();
   // Not safe, but this is a unittest, so whatever.
   WebFrameImpl* web_frame_impl = reinterpret_cast<WebFrameImpl*>(web_frame);
   WebCore::Frame* frame = web_frame_impl->frame();
 
   // Grab a page that takes at least 1 sec to respond, but set the fetcher to
   // timeout in 0 sec.
-  GURL url = server->TestServerPage("slow?1");
+  GURL url = server.TestServerPage("slow?1");
   scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
   scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcherWithTimeout(
       url, frame, 0, delegate.get()));
 
   delegate->WaitForResponse();
 
   // When we timeout, we still call the Delegate callback but we pass in empty
   // values.
   EXPECT_TRUE(delegate->completed());
   EXPECT_TRUE(delegate->response().isNull());
   EXPECT_EQ(delegate->data(), std::string());
   EXPECT_TRUE(delegate->time_elapsed_ms() < kMaxWaitTimeMs);
 }
 
 }  // namespace