Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

content/browser/renderer_host/resource_dispatcher_host.cc

 // 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
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 77 matching lines @@
 using content::GlobalRequestID;
 using content::ResourceResponse;
 using content::WebContents;
 using content::WorkerServiceImpl;
 using webkit_blob::DeletableFileReference;
 
 // ----------------------------------------------------------------------------
 
 namespace {
 
+static ResourceDispatcherHost* g_resource_dispatcher_host;
+
 // The interval for calls to ResourceDispatcherHost::UpdateLoadStates
 const int kUpdateLoadStatesIntervalMsec = 100;
 
 // Maximum number of pending data messages sent to the renderer at any
 // given time for a given request.
 const int kMaxPendingDataMessages = 20;
 
 // Maximum byte "cost" of all the outstanding requests for a renderer.
 // See delcaration of |max_outstanding_requests_cost_per_process_| for details.
 // This bound is 25MB, which allows for around 6000 outstanding requests.
@@ skipping 179 matching lines @@
 
 void OnSwapOutACKHelper(int render_process_id, int render_view_id) {
   RenderViewHost* rvh = RenderViewHost::FromID(render_process_id,
                                                render_view_id);
   if (rvh)
     rvh->OnSwapOutACK();
 }
 
 }  // namespace
 
-ResourceDispatcherHost::ResourceDispatcherHost(
-    const ResourceQueue::DelegateSet& resource_queue_delegates)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
+ResourceDispatcherHost* ResourceDispatcherHost::Get() {
+  if (!g_resource_dispatcher_host)
+    g_resource_dispatcher_host = new ResourceDispatcherHost();

[Jói, 2012/01/10 10:58:57]

The assignment is not needed, since the ResourceDispatcherHost constructor
already assigns the new object to g_resource_dispatcher_host.  Should perhaps
just have a DCHECK here that it became non-NULL.

[jam, 2012/01/10 17:34:08]

Done.

+  return g_resource_dispatcher_host;
+}
+
+bool ResourceDispatcherHost::IsCreated() {
+  return !!g_resource_dispatcher_host;
+}
+
+ResourceDispatcherHost::ResourceDispatcherHost()
+    : temporarily_delegate_set_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
           download_file_manager_(new DownloadFileManager(this, NULL))),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           save_file_manager_(new SaveFileManager(this))),
       request_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       is_shutdown_(false),
       max_outstanding_requests_cost_per_process_(
           kMaxOutstandingRequestsCostPerProcess),
       filter_(NULL),
       delegate_(NULL),
       allow_cross_origin_auth_prompt_(false) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!g_resource_dispatcher_host);
+  g_resource_dispatcher_host = this;
+
+  ResourceQueue::DelegateSet resource_queue_delegates;
+  temporarily_delegate_set_ = &resource_queue_delegates;
+  content::GetContentClient()->browser()->ResourceDispatcherHostCreated();
   resource_queue_.Initialize(resource_queue_delegates);
+  temporarily_delegate_set_ = NULL;
 
   ANNOTATE_BENIGN_RACE(
       &last_user_gesture_time_,
       "We don't care about the precise value, see http://crbug.com/92889");
+
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&appcache::AppCacheInterceptor::EnsureRegistered));
 }
 
 ResourceDispatcherHost::~ResourceDispatcherHost() {
+  DCHECK(g_resource_dispatcher_host);
+  g_resource_dispatcher_host = NULL;
   AsyncResourceHandler::GlobalCleanup();
   for (PendingRequestList::const_iterator i = pending_requests_.begin();
        i != pending_requests_.end(); ++i) {
     transferred_navigations_.erase(i->first);
   }
   STLDeleteValues(&pending_requests_);
   DCHECK(transferred_navigations_.empty());
 }
 
-void ResourceDispatcherHost::Initialize() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&appcache::AppCacheInterceptor::EnsureRegistered));
-}
-
 void ResourceDispatcherHost::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&ResourceDispatcherHost::OnShutdown,
                                      base::Unretained(this)));
 }
 
+void ResourceDispatcherHost::AddResourceQueueDelegate(
+    ResourceQueueDelegate* delegate) {
+  temporarily_delegate_set_->insert(delegate);
+}
+
 void ResourceDispatcherHost::SetRequestInfo(
     net::URLRequest* request,
     ResourceDispatcherHostRequestInfo* info) {
   request->SetUserData(NULL, info);
 }
 
 void ResourceDispatcherHost::OnShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   is_shutdown_ = true;
   resource_queue_.Shutdown();
@@ skipping 1895 matching lines @@
     const GlobalRequestID& transferred_request_id,
     net::URLRequest* ransferred_request) {
   transferred_navigations_[transferred_request_id] = ransferred_request;
 }
 
 bool ResourceDispatcherHost::IsTransferredNavigation(
     const content::GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }