Moved all state from SiteIsolationPolicy out to the PendingRequestInfo struct in the ResourceSchedu…

content/child/resource_dispatcher.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #ifndef CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 #define CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "webkit/child/resource_loader_bridge.h"
 
 struct ResourceMsg_RequestCompleteData;
 
 namespace content {
 class ResourceDispatcherDelegate;
 struct ResourceResponseHead;
+struct SiteIsolationResponseMetaData;
 
 // This class serves as a communication interface between the
 // ResourceDispatcherHost in the browser process and the ResourceLoaderBridge in
 // the child process.  It can be used from any child process.
 class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
  public:
   explicit ResourceDispatcher(IPC::Sender* sender);
   virtual ~ResourceDispatcher();
 
   // IPC::Listener implementation.
@@ skipping 69 matching lines @@
     GURL url;
     // The security origin of the frame that initiates this request.
     GURL frame_origin;
     // The url of the latest response even in case of redirection.
     GURL response_url;
     linked_ptr<IPC::Message> pending_redirect_message;
     base::TimeTicks request_start;
     base::TimeTicks response_start;
     base::TimeTicks completion_time;
     linked_ptr<base::SharedMemory> buffer;
+    linked_ptr<SiteIsolationResponseMetaData> site_isolation_metadata;
+    bool blocked_response;
     int buffer_size;
   };
   typedef base::hash_map<int, PendingRequestInfo> PendingRequestList;
 
   // Helper to lookup the info based on the request_id.
   // May return NULL if the request as been canceled from the client side.
   PendingRequestInfo* GetPendingRequestInfo(int request_id);
 
   // Follows redirect, if any, for the given request.
   void FollowPendingRedirect(int request_id, PendingRequestInfo& request_info);
@@ skipping 73 matching lines @@
 
   // IO thread timestamp for ongoing IPC message.
   base::TimeTicks io_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_RESOURCE_DISPATCHER_H_