Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 4 insertions, 39 deletions

diff --git a/chrome/browser/renderer_host/resource_request_details.h b/chrome/browser/renderer_host/resource_request_details.h
index 6af9f85..36f3456 100644
--- a/chrome/browser/renderer_host/resource_request_details.h
+++ b/chrome/browser/renderer_host/resource_request_details.h
@@ -24,43 +24,9 @@ class URLRequest;
 // Details about a resource request notification.
 class ResourceRequestDetails {
  public:
-  ResourceRequestDetails(const URLRequest* request, int cert_id)
-      : url_(request->url()),
-        original_url_(request->original_url()),
-        method_(request->method()),
-        referrer_(request->referrer()),
-        has_upload_(request->has_upload()),
-        load_flags_(request->load_flags()),
-        status_(request->status()),
-        ssl_cert_id_(cert_id),
-        ssl_cert_status_(request->ssl_info().cert_status) {
-    const ResourceDispatcherHostRequestInfo* info =
-        ResourceDispatcherHost::InfoForRequest(request);
-    DCHECK(info);
-    resource_type_ = info->resource_type();
-    frame_origin_ = info->frame_origin();
-    main_frame_origin_ = info->main_frame_origin();
+  ResourceRequestDetails(const URLRequest* request, int cert_id);
 
-    // If request is from the worker process on behalf of a renderer, use
-    // the renderer process id, since it consumes the notification response
-    // such as ssl state etc.
-    const WorkerProcessHost::WorkerInstance* worker_instance =
-        WorkerService::GetInstance()->FindWorkerInstance(info->child_id());
-    if (worker_instance) {
-      DCHECK(!worker_instance->worker_document_set()->IsEmpty());
-      const WorkerDocumentSet::DocumentInfoSet& parents =
-          worker_instance->worker_document_set()->documents();
-      // TODO(atwilson): need to notify all associated renderers in the case
-      // of ssl state change (http://crbug.com/25357). For now, just notify
-      // the first one (works for dedicated workers and shared workers with
-      // a single process).
-      origin_child_id_ = parents.begin()->renderer_id();
-    } else {
-      origin_child_id_ = info->child_id();
-    }
-  }
-
-  virtual ~ResourceRequestDetails() {}
+  virtual ~ResourceRequestDetails();
 
   const GURL& url() const { return url_; }
   const GURL& original_url() const { return original_url_; }
@@ -97,9 +63,8 @@ class ResourceRedirectDetails : public ResourceRequestDetails {
  public:
   ResourceRedirectDetails(const URLRequest* request,
                           int cert_id,
-                          const GURL& new_url)
-      : ResourceRequestDetails(request, cert_id),
-        new_url_(new_url) {}
+                          const GURL& new_url);
+  virtual ~ResourceRedirectDetails();
 
   // The URL to which we are being redirected.
   const GURL& new_url() const { return new_url_; }