Move load_from_memory_cache_details.* to content now that the SSL code has moved. Also move two easy dependencies behind the ContentBrowserClient.

BUG=76697
Review URL: http://codereview.chromium.org/7044130

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88807 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 32 insertions, 11 deletions

diff --git a/content/browser/renderer_host/async_resource_handler.cc b/content/browser/renderer_host/async_resource_handler.cc
index 44866d1..21986e8 100644
--- a/content/browser/renderer_host/async_resource_handler.cc
+++ b/content/browser/renderer_host/async_resource_handler.cc
@@ -11,10 +11,10 @@
 #include "base/logging.h"
 #include "base/shared_memory.h"
 #include "chrome/browser/debugger/devtools_netlog_observer.h"
-#include "chrome/browser/net/load_timing_observer.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/common/resource_response.h"
@@ -105,7 +105,9 @@ bool AsyncResourceHandler::OnRequestRedirected(int request_id,
   *defer = true;
   net::URLRequest* request = rdh_->GetURLRequest(
       GlobalRequestID(filter_->child_id(), request_id));
-  LoadTimingObserver::PopulateTimingInfo(request, response);
+  if (rdh_->delegate())
+    rdh_->delegate()->OnRequestRedirected(request, response);
+
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
   return filter_->Send(new ResourceMsg_ReceivedRedirect(
       routing_id_, request_id, new_url, response->response_head));
@@ -121,7 +123,9 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
   net::URLRequest* request = rdh_->GetURLRequest(
       GlobalRequestID(filter_->child_id(), request_id));
 
-  LoadTimingObserver::PopulateTimingInfo(request, response);
+  if (rdh_->delegate())
+    rdh_->delegate()->OnResponseStarted(request, response);
+
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
 
   ResourceDispatcherHostRequestInfo* info = rdh_->InfoForRequest(request);
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 0c03e9f..86a2af7 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -63,9 +63,6 @@
 #if defined(OS_WIN)
 #include "content/common/child_process_host.h"
 #endif
-#if defined(USE_NSS)
-#include "chrome/browser/ui/crypto_module_password_dialog.h"
-#endif
 
 using net::CookieStore;
 
@@ -808,8 +805,7 @@ void RenderMessageFilter::OnKeygenOnWorkerThread(
 #if defined(USE_NSS)
   // Attach a password delegate so we can authenticate.
   keygen_handler.set_crypto_module_password_delegate(
-      browser::NewCryptoModuleBlockingDialogDelegate(
-          browser::kCryptoModulePasswordKeygen, url.host()));
+      content::GetContentClient()->browser()->GetCryptoPasswordDelegate(url));
 #endif  // defined(USE_NSS)
 
   ViewHostMsg_Keygen::WriteReplyParams(
diff --git a/content/browser/renderer_host/resource_dispatcher_host_delegate.cc b/content/browser/renderer_host/resource_dispatcher_host_delegate.cc
index c10f999..849b6a4 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_delegate.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_delegate.cc
@@ -66,3 +66,11 @@ bool ResourceDispatcherHostDelegate::ShouldForceDownloadResource(
     const GURL& url, const std::string& mime_type) {
   return false;
 }
+
+void ResourceDispatcherHostDelegate::OnResponseStarted(
+    net::URLRequest* request, ResourceResponse* response) {
+}
+
+void ResourceDispatcherHostDelegate::OnRequestRedirected(
+    net::URLRequest* request, ResourceResponse* response) {
+}
diff --git a/content/browser/renderer_host/resource_dispatcher_host_delegate.h b/content/browser/renderer_host/resource_dispatcher_host_delegate.h
index 0aee39a..bd25993 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_delegate.h
+++ b/content/browser/renderer_host/resource_dispatcher_host_delegate.h
@@ -14,6 +14,7 @@ class GURL;
 class ResourceDispatcherHostLoginDelegate;
 class ResourceHandler;
 struct ResourceHostMsg_Request;
+struct ResourceResponse;
 
 namespace content {
 class ResourceContext;
@@ -88,6 +89,14 @@ class ResourceDispatcherHostDelegate {
   virtual bool ShouldForceDownloadResource(
       const GURL& url, const std::string& mime_type);
 
+  // Informs the delegate that a response has started.
+  virtual void OnResponseStarted(net::URLRequest* request,
+                                 ResourceResponse* response);
+
+  // Informs the delegate that a request has been redirected.
+  virtual void OnRequestRedirected(net::URLRequest* request,
+                                   ResourceResponse* response);
+
  protected:
   ResourceDispatcherHostDelegate();
   virtual ~ResourceDispatcherHostDelegate();
diff --git a/content/browser/renderer_host/sync_resource_handler.cc b/content/browser/renderer_host/sync_resource_handler.cc
index 6d34094..6599e22 100644
--- a/content/browser/renderer_host/sync_resource_handler.cc
+++ b/content/browser/renderer_host/sync_resource_handler.cc
@@ -6,9 +6,9 @@
 
 #include "base/logging.h"
 #include "chrome/browser/debugger/devtools_netlog_observer.h"
-#include "chrome/browser/net/load_timing_observer.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/common/resource_messages.h"
 #include "net/base/io_buffer.h"
@@ -41,7 +41,9 @@ bool SyncResourceHandler::OnRequestRedirected(int request_id,
                                               bool* defer) {
   net::URLRequest* request = rdh_->GetURLRequest(
       GlobalRequestID(filter_->child_id(), request_id));
-  LoadTimingObserver::PopulateTimingInfo(request, response);
+  if (rdh_->delegate())
+    rdh_->delegate()->OnRequestRedirected(request, response);
+
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
   // TODO(darin): It would be much better if this could live in WebCore, but
   // doing so requires API changes at all levels.  Similar code exists in
@@ -58,7 +60,9 @@ bool SyncResourceHandler::OnResponseStarted(int request_id,
                                             ResourceResponse* response) {
   net::URLRequest* request = rdh_->GetURLRequest(
       GlobalRequestID(filter_->child_id(), request_id));
-  LoadTimingObserver::PopulateTimingInfo(request, response);
+  if (rdh_->delegate())
+    rdh_->delegate()->OnResponseStarted(request, response);
+
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
 
   // We don't care about copying the status here.