Extract SyncLoadResponse struct from ResourceLoaderBridge.

webkit/child/resource_loader_bridge.h

 // 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.
 //
 // The intent of this file is to provide a type-neutral abstraction between
 // Chrome and WebKit for resource loading. This pure-virtual interface is
 // implemented by the embedder.
 //
 // One of these objects will be created by WebKit for each request. WebKit
 // will own the pointer to the bridge, and will delete it when the request is
@@ skipping 10 matching lines @@
 #include "build/build_config.h"
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 #include "base/memory/ref_counted.h"
 #include "base/platform_file.h"
 #include "base/values.h"
 #include "net/base/request_priority.h"
 #include "url/gurl.h"
 #include "webkit/child/webkit_child_export.h"
-#include "webkit/common/resource_response_info.h"
 
 // TODO(pilgrim) remove this once resource loader is moved to content
 // http://crbug.com/338338
 namespace content {
 class ResourceRequestBody;
+struct SyncLoadResponse;
 }
 
 namespace webkit_glue {
 
+struct ResourceResponseInfo;
+
 class ResourceLoaderBridge {
  public:
-  // See the SyncLoad method declared below.  (The name of this struct is not
-  // suffixed with "Info" because it also contains the response data.)
-  struct SyncLoadResponse : ResourceResponseInfo {
-    WEBKIT_CHILD_EXPORT SyncLoadResponse();
-    WEBKIT_CHILD_EXPORT ~SyncLoadResponse();
-
-    // The response error code.
-    int error_code;
-
-    // The final URL of the response.  This may differ from the request URL in
-    // the case of a server redirect.
-    GURL url;
-
-    // The response data.
-    std::string data;
-  };
-
   // Generated by the bridge. This is implemented by our custom resource loader
   // within webkit. The Peer and it's bridge should have identical lifetimes
   // as they represent each end of a communication channel.
   //
   // These callbacks mirror net::URLRequest::Delegate and the order and
   // conditions in which they will be called are identical. See url_request.h
   // for more information.
   class WEBKIT_CHILD_EXPORT Peer {
    public:
     // Called as upload progress is made.
@@ skipping 79 matching lines @@
   // call to the Start method.
   virtual void DidChangePriority(net::RequestPriority new_priority) = 0;
 
   // Call this method to load the resource synchronously (i.e., in one shot).
   // This is an alternative to the Start method.  Be warned that this method
   // will block the calling thread until the resource is fully downloaded or an
   // error occurs.  It could block the calling thread for a long time, so only
   // use this if you really need it!  There is also no way for the caller to
   // interrupt this method.  Errors are reported via the status field of the
   // response parameter.
-  virtual void SyncLoad(SyncLoadResponse* response) = 0;
+  virtual void SyncLoad(content::SyncLoadResponse* response) = 0;
 
  protected:
   // Construction must go through
   // WebKitPlatformSupportImpl::CreateResourceLoader()
   // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload
   // methods may be called to construct the body of the request.
   WEBKIT_CHILD_EXPORT ResourceLoaderBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_