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

1 files changed, 14 insertions, 1 deletions

diff --git a/content/browser/content_browser_client.h b/content/browser/content_browser_client.h
index 6149d15..51a4d30 100644
--- a/content/browser/content_browser_client.h
+++ b/content/browser/content_browser_client.h
@@ -28,6 +28,10 @@ class TabContents;
 class WorkerProcessHost;
 struct DesktopNotificationHostMsg_Show_Params;
 
+namespace crypto {
+class CryptoModuleBlockingPasswordDelegate;
+}
+
 namespace net {
 class CookieList;
 class CookieOptions;
@@ -179,7 +183,8 @@ class ContentBrowserClient {
       int notification_id);
 
   // Returns true if the given page is allowed to open a window of the given
-  // type. This is called on the IO thread.
+  // type.
+  // This is called on the IO thread.
   virtual bool CanCreateWindow(
       const GURL& source_url,
       WindowContainerType container_type,
@@ -199,6 +204,14 @@ class ContentBrowserClient {
   // Can return an optional fd for crash handling, otherwise returns -1.
   virtual int GetCrashSignalFD(const std::string& process_type);
 #endif
+
+#if defined(USE_NSS)
+  // Return a delegate to authenticate and unlock |module|.
+  // This is called on a worker thread.
+  virtual
+      crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
+          const GURL& url);
+#endif
 };
 
 }  // namespace content