Cleanup ResourceDispatcher::PendingRequestInfo

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 <stdint.h>
 
 #include <deque>
+#include <map>
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
@@ skipping 111 matching lines @@
   }
 
   void SetResourceSchedulingFilter(
       scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter);
 
  private:
   friend class ResourceDispatcherTest;
 
   typedef std::deque<IPC::Message*> MessageQueue;
   struct PendingRequestInfo {
-    PendingRequestInfo();
-
     PendingRequestInfo(RequestPeer* peer,
                        ResourceType resource_type,
                        int origin_pid,
                        const GURL& frame_origin,
                        const GURL& request_url,
                        bool download_to_file);
 
     ~PendingRequestInfo();
 
     RequestPeer* peer;
-    ThreadedDataProvider* threaded_data_provider;
+    ThreadedDataProvider* threaded_data_provider = nullptr;
     ResourceType resource_type;
     // The PID of the original process which issued this request. This gets
     // non-zero only for a request proxied by another renderer, particularly
     // requests from plugins.
     int origin_pid;
     MessageQueue deferred_message_queue;
-    bool is_deferred;
+    bool is_deferred = false;
     // Original requested url.
     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;
     bool download_to_file;
-    linked_ptr<IPC::Message> pending_redirect_message;
+    scoped_ptr<IPC::Message> pending_redirect_message;
     base::TimeTicks request_start;
     base::TimeTicks response_start;
     base::TimeTicks completion_time;
     linked_ptr<base::SharedMemory> buffer;
     scoped_refptr<SharedMemoryReceivedDataFactory> received_data_factory;
-    linked_ptr<SiteIsolationResponseMetaData> site_isolation_metadata;
+    scoped_ptr<SiteIsolationResponseMetaData> site_isolation_metadata;
     int buffer_size;
 
     // Debugging for https://code.google.com/p/chromium/issues/detail?id=527588.
-    int data_offset;
+    int data_offset = -1;
   };
-  typedef base::hash_map<int, PendingRequestInfo> PendingRequestList;
+  using PendingRequestMap = std::map<int, scoped_ptr<PendingRequestInfo>>;
 
   // 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);
+  void FollowPendingRedirect(int request_id, PendingRequestInfo* request_info);
 
   // Message response handlers, called by the message handler for this process.
   void OnUploadProgress(int request_id, int64_t position, int64_t size);
   void OnReceivedResponse(int request_id, const ResourceResponseHead&);
   void OnReceivedCachedMetadata(int request_id, const std::vector<char>& data);
   void OnReceivedRedirect(int request_id,
                           const net::RedirectInfo& redirect_info,
                           const ResourceResponseHead& response_head);
   void OnSetDataBuffer(int request_id,
                        base::SharedMemoryHandle shm_handle,
@@ skipping 44 matching lines @@
   static void ReleaseResourcesInMessageQueue(MessageQueue* queue);
 
   scoped_ptr<ResourceHostMsg_Request> CreateRequest(
       const RequestInfo& request_info,
       ResourceRequestBody* request_body,
       GURL* frame_origin);
 
   IPC::Sender* message_sender_;
 
   // All pending requests issued to the host
-  PendingRequestList pending_requests_;
+  PendingRequestMap pending_requests_;
 
   ResourceDispatcherDelegate* delegate_;
 
   // IO thread timestamp for ongoing IPC message.
   base::TimeTicks io_timestamp_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter_;
 
   base::WeakPtrFactory<ResourceDispatcher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_RESOURCE_DISPATCHER_H_