Remove dependency of ResourceDispatcherHostImpl on RenderViewHostImpl

content/browser/loader/resource_dispatcher_host_impl.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.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 42 matching lines @@
 
 namespace storage {
 class ShareableFileReference;
 }
 
 namespace content {
 class AppCacheService;
 class AsyncRevalidationManager;
 class CertStore;
 class FrameTree;
+class LoaderDelegate;
 class NavigationURLLoaderImplCore;
 class RenderFrameHostImpl;
 class ResourceContext;
 class ResourceDispatcherHostDelegate;
 class ResourceMessageDelegate;
 class ResourceMessageFilter;
 class ResourceRequestInfoImpl;
 class SaveFileManager;
 class ServiceWorkerNavigationHandleCore;
 class WebContentsImpl;
@@ skipping 226 matching lines @@
   void BeginNavigationRequest(
       ResourceContext* resource_context,
       const NavigationRequestInfo& info,
       NavigationURLLoaderImplCore* loader,
       ServiceWorkerNavigationHandleCore* service_worker_handle_core);
 
   // Turns on stale-while-revalidate support, regardless of command-line flags
   // or experiment status. For unit tests only.
   void EnableStaleWhileRevalidateForTesting();
 
+  void SetLoaderDelegate(LoaderDelegate* loader_delegate);
+
  private:
   friend class LoaderIOThreadNotifier;
   friend class ResourceDispatcherHostTest;
 
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            TestBlockedRequestsProcessDies);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            CalculateApproximateMemoryCost);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DetachableResourceTimesOut);
@@ skipping 112 matching lines @@
   // listed in the order in which they usually occur during the lifetime of a
   // request, so states with larger numeric values are generally further along
   // toward completion.
   //
   // For example, by this measure "tranferring data" is a more interesting state
   // than "resolving host" because when transferring data something is being
   // done that corresponds to changes that the user might observe, whereas
   // waiting for a host name to resolve implies being stuck.
   static bool LoadInfoIsMoreInteresting(const LoadInfo& a, const LoadInfo& b);
 
-  // Used to marshal calls to LoadStateChanged from the IO to UI threads.  All
-  // are done as a single callback to avoid spamming the UI thread.
-  static void UpdateLoadInfoOnUIThread(std::unique_ptr<LoadInfoMap> info_map);
-
   // Gets the most interesting LoadInfo for each GlobalRoutingID.
   std::unique_ptr<LoadInfoMap> GetLoadInfoForAllRoutes();
 
   // Checks all pending requests and updates the load info if necessary.
   void UpdateLoadInfo();
 
   // Resumes or cancels (if |cancel_requests| is true) any blocked requests.
   void ProcessBlockedRequestsForRoute(
       const GlobalFrameRoutingId& global_routing_id,
       bool cancel_requests);
@@ skipping 171 matching lines @@
   // flag to requests occurring soon after a gesture to indicate they
   // may be because of explicit user action.
   base::TimeTicks last_user_gesture_time_;
 
   // Used during IPC message dispatching so that the handlers can get a pointer
   // to the source of the message.
   ResourceMessageFilter* filter_;
 
   ResourceDispatcherHostDelegate* delegate_;
 
+  LoaderDelegate* loader_delegate_;
+
   bool allow_cross_origin_auth_prompt_;
 
   // AsyncRevalidationManager is non-NULL if and only if
   // stale-while-revalidate is enabled.
   std::unique_ptr<AsyncRevalidationManager> async_revalidation_manager_;
 
   typedef std::map<GlobalRequestID,
                    base::ObserverList<ResourceMessageDelegate>*> DelegateMap;
   DelegateMap delegate_map_;
 
   std::unique_ptr<ResourceScheduler> scheduler_;
 
   // Allows tests to use a mock CertStore. If set, the CertStore must
   // outlive this ResourceDispatcherHostImpl.
   CertStore* cert_store_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_