Remove prerender cookie store, part 4.

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 31959739147ca2cb4c74666050db4a9c7f1c45ef..180e819ac7464bc380e75f381e8f883e017b1ab8 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -57,7 +57,6 @@ class ImageSkia;
 
 namespace net {
 class CookieOptions;
-class CookieStore;
 class NetLog;
 class SSLCertRequestInfo;
 class SSLInfo;
@@ -587,12 +586,6 @@ class CONTENT_EXPORT ContentBrowserClient {
       BrowserContext* browser_context,
       const GURL& url);
 
-  // Returns a special cookie store to use for a given render process, or
-  // nullptr if the default cookie store should be used.
-  // This is called on the IO thread.
-  virtual net::CookieStore* OverrideCookieStoreForRenderProcess(
-      int render_process_id);

[mmenke, 2015/03/20 14:55:53]

Shouldn't this be part of the other CL?

[davidben, 2015/03/20 17:35:26]

Oops! Moved it over to the other CL. (I'll upload a new version of this after
the parent CL lands and I can actually run try jobs. It needs constant rebasing
anyway.)

-
   // Checks if |security_origin| has permission to access the microphone or
   // camera. Note that this does not query the user. |type| must be
   // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.