Remove webkit's ResourceLoaderBridge interface.

content/child/resource_dispatcher_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process.h"
 #include "base/process/process_handle.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/request_info.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/child/request_peer.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/child/resource_loader_bridge.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
 
-using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceResponseInfo;
 
 namespace content {
 
 static const char test_page_url[] = "http://www.google.com/";
 static const char test_page_headers[] =
   "HTTP/1.1 200 OK\nContent-Type:text/html\n\n";
 static const char test_page_mime_type[] = "text/html";
 static const char test_page_charset[] = "";
 static const char test_page_contents[] =
@@ skipping 121 matching lines @@
 
  protected:
   // testing::Test
   virtual void SetUp() OVERRIDE {
     dispatcher_.reset(new ResourceDispatcher(this));
   }
   virtual void TearDown() OVERRIDE {
     dispatcher_.reset();
   }
 
-  ResourceLoaderBridge* CreateBridge() {
-    RequestInfo request_info;
-    request_info.method = "GET";
-    request_info.url = GURL(test_page_url);
-    request_info.first_party_for_cookies = GURL(test_page_url);
-    request_info.referrer = GURL();
-    request_info.headers = std::string();
-    request_info.load_flags = 0;
-    request_info.requestor_pid = 0;
-    request_info.request_type = ResourceType::SUB_RESOURCE;
-    request_info.appcache_host_id = appcache::kNoHostId;
-    request_info.routing_id = 0;
+  RequestInfo* CreateRequestInfo() {
+    RequestInfo* request_info = new RequestInfo();
+    request_info->method = "GET";
+    request_info->url = GURL(test_page_url);
+    request_info->first_party_for_cookies = GURL(test_page_url);
+    request_info->referrer = GURL();
+    request_info->headers = std::string();
+    request_info->load_flags = 0;
+    request_info->requestor_pid = 0;
+    request_info->request_type = ResourceType::SUB_RESOURCE;
+    request_info->appcache_host_id = appcache::kNoHostId;
+    request_info->routing_id = 0;
     RequestExtraData extra_data;
-    request_info.extra_data = &extra_data;
+    request_info->extra_data = &extra_data;
 
-    return dispatcher_->CreateBridge(request_info);
+    return request_info;
   }
 
   std::vector<IPC::Message> message_queue_;
   static scoped_ptr<ResourceDispatcher> dispatcher_;
 };
 
-/*static*/
+// static
 scoped_ptr<ResourceDispatcher> ResourceDispatcherTest::dispatcher_;
 
 // Does a simple request and tests that the correct data is received.
 TEST_F(ResourceDispatcherTest, RoundTrip) {
+  scoped_ptr<RequestInfo> request_info(CreateRequestInfo());
   TestRequestCallback callback;
-  ResourceLoaderBridge* bridge = CreateBridge();
 
-  bridge->Start(&callback);
+  dispatcher_->StartAsync(*request_info.get(), NULL, &callback);
 
   ProcessMessages();
 
   // FIXME(brettw) when the request complete messages are actually handledo
   // and dispatched, uncomment this.
   //EXPECT_TRUE(callback.complete());
   //EXPECT_STREQ(test_page_contents, callback.data().c_str());
   //EXPECT_EQ(test_page_contents_len, callback.total_encoded_data_length());
-
-  delete bridge;
 }
 
 // Tests that the request IDs are straight when there are multiple requests.
 TEST_F(ResourceDispatcherTest, MultipleRequests) {
   // FIXME
 }
 
 // Tests that the cancel method prevents other messages from being received
 TEST_F(ResourceDispatcherTest, Cancel) {
   // FIXME
@@ skipping 104 matching lines @@
     return defer_loading_;
   }
 
   bool defer_loading_;
   base::SharedMemory shared_handle_;
 };
 
 TEST_F(DeferredResourceLoadingTest, DeferredLoadTest) {
   base::MessageLoopForIO message_loop;
 
-  ResourceLoaderBridge* bridge = CreateBridge();
-
-  bridge->Start(this);
+  scoped_ptr<RequestInfo> request_info(CreateRequestInfo());
+  dispatcher_->StartAsync(*request_info.get(), NULL, this);
   InitMessages();
 
   // Dispatch deferred messages.
   message_loop.RunUntilIdle();
-  delete bridge;
 }
 
 class TimeConversionTest : public ResourceDispatcherTest,
                            public RequestPeer {
  public:
   virtual bool Send(IPC::Message* msg) OVERRIDE {
     delete msg;
     return true;
   }
 
   void PerformTest(const ResourceResponseHead& response_head) {
-    scoped_ptr<ResourceLoaderBridge> bridge(CreateBridge());
-    bridge->Start(this);
+    scoped_ptr<RequestInfo> request_info(CreateRequestInfo());
+    dispatcher_->StartAsync(*request_info.get(), NULL, this);
 
     dispatcher_->OnMessageReceived(
         ResourceMsg_ReceivedResponse(0, response_head));
   }
 
   // RequestPeer methods.
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE {
   }
 
   virtual bool OnReceivedRedirect(
@@ skipping 70 matching lines @@
   response_head.error_code = net::OK;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content