Get rid of stashing a frame pointer with ResourceRequest and just store the r...

webkit/tools/test_shell/simple_resource_loader_bridge.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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using URLRequest, meaning it is a "simple" version
 // that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because URLRequest only provides an asynchronous resource loading API, this
@@ skipping 526 matching lines @@
 };
 
 }  // anonymous namespace
 
 //-----------------------------------------------------------------------------
 
 namespace webkit_glue {
 
 // factory function
 ResourceLoaderBridge* ResourceLoaderBridge::Create(
-    WebFrame* webframe,
     const std::string& method,
     const GURL& url,
     const GURL& policy_url,
     const GURL& referrer,
     const std::string& headers,
     int load_flags,
-    int origin_pid,
+    int requestor_pid,
     ResourceType::Type request_type,
-    bool mixed_contents) {
-  return new ResourceLoaderBridgeImpl(method, url, policy_url, referrer,
-                                      headers, load_flags);
+    bool mixed_contents,
+    int routing_id) {
+  return new ResourceLoaderBridgeImpl(method, url, policy_url,
+                                      referrer, headers, load_flags);
 }
 
 // Issue the proxy resolve request on the io thread, and wait
 // for the result.
 bool FindProxyForUrl(const GURL& url, std::string* proxy_list) {
   DCHECK(request_context);
 
   scoped_refptr<net::SyncProxyServiceHelper> sync_proxy_service(
       new net::SyncProxyServiceHelper(io_thread->message_loop(),
       request_context->proxy_service()));
@@ skipping 58 matching lines @@
     return std::string();
   }
 
   scoped_refptr<CookieGetter> getter = new CookieGetter();
 
   io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
       getter.get(), &CookieGetter::Get, url));
 
   return getter->GetResult();
 }