Allow the content browser client to specify a special cookie store to be

used for a given render process id. This special cookie store will then
be used for renderer messages pertaining to cookies, url fetches in net,
and websockets. If the special cookie store is NULL, a default cookie store
will be used.

Re-submit of https://codereview.chromium.org/188693003

See https://codereview.chromium.org/188693003 for reviewers/lgtm's.

Review URL: https://codereview.chromium.org/197043005

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

4 files changed, 12 insertions, 8 deletions

diff --git a/webkit/browser/appcache/appcache_storage_impl_unittest.cc b/webkit/browser/appcache/appcache_storage_impl_unittest.cc
index 7eba545..8a4d5d7 100644
--- a/webkit/browser/appcache/appcache_storage_impl_unittest.cc
+++ b/webkit/browser/appcache/appcache_storage_impl_unittest.cc
@@ -1746,7 +1746,7 @@ class AppCacheStorageImplTest : public testing::Test {
       AppCacheHost* host2 = backend_->GetHost(2);
       GURL manifest_url = MockHttpServer::GetMockUrl("manifest");
       request_ = service()->request_context()->CreateRequest(
-          manifest_url, net::DEFAULT_PRIORITY, NULL);
+          manifest_url, net::DEFAULT_PRIORITY, NULL, NULL);
       AppCacheInterceptor::SetExtraRequestInfo(
           request_.get(), service_.get(),
           backend_->process_id(), host2->host_id(),
diff --git a/webkit/browser/appcache/appcache_update_job.cc b/webkit/browser/appcache/appcache_update_job.cc
index 03bb909..253aee7 100644
--- a/webkit/browser/appcache/appcache_update_job.cc
+++ b/webkit/browser/appcache/appcache_update_job.cc
@@ -112,7 +112,7 @@ AppCacheUpdateJob::URLFetcher::URLFetcher(const GURL& url,
       retry_503_attempts_(0),
       buffer_(new net::IOBuffer(kBufferSize)),
       request_(job->service_->request_context()
-                   ->CreateRequest(url, net::DEFAULT_PRIORITY, this)),
+               ->CreateRequest(url, net::DEFAULT_PRIORITY, this, NULL)),
       result_(UPDATE_OK) {}
 
 AppCacheUpdateJob::URLFetcher::~URLFetcher() {
@@ -314,7 +314,7 @@ bool AppCacheUpdateJob::URLFetcher::MaybeRetryRequest() {
   ++retry_503_attempts_;
   result_ = UPDATE_OK;
   request_ = job_->service_->request_context()->CreateRequest(
-      url_, net::DEFAULT_PRIORITY, this);
+      url_, net::DEFAULT_PRIORITY, this, NULL);
   Start();
   return true;
 }
diff --git a/webkit/browser/appcache/appcache_url_request_job_unittest.cc b/webkit/browser/appcache/appcache_url_request_job_unittest.cc
index 3f9675a..a6e6027 100644
--- a/webkit/browser/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/browser/appcache/appcache_url_request_job_unittest.cc
@@ -448,7 +448,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
     AppCacheStorage* storage = service_->storage();
     request_ = empty_context_.CreateRequest(GURL("http://blah/"),
                                             net::DEFAULT_PRIORITY,
-                                            url_request_delegate_.get());
+                                            url_request_delegate_.get(),
+                                            NULL);
 
     // Setup to create an AppCacheURLRequestJob with orders to deliver
     // a network response.
@@ -483,7 +484,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
     AppCacheStorage* storage = service_->storage();
     request_ = empty_context_.CreateRequest(GURL("http://blah/"),
                                             net::DEFAULT_PRIORITY,
-                                            url_request_delegate_.get());
+                                            url_request_delegate_.get(),
+                                            NULL);
 
     // Setup to create an AppCacheURLRequestJob with orders to deliver
     // a network response.
@@ -533,7 +535,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
     AppCacheStorage* storage = service_->storage();
     request_ = empty_context_.CreateRequest(GURL("http://blah/"),
                                             net::DEFAULT_PRIORITY,
-                                            url_request_delegate_.get());
+                                            url_request_delegate_.get(),
+                                            NULL);
 
     // Setup to create an AppCacheURLRequestJob with orders to deliver
     // a network response.
@@ -647,7 +650,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
     AppCacheStorage* storage = service_->storage();
     request_ = empty_context_.CreateRequest(GURL("http://blah/"),
                                             net::DEFAULT_PRIORITY,
-                                            url_request_delegate_.get());
+                                            url_request_delegate_.get(),
+                                            NULL);
 
     // Request a range, the 3 middle chars out of 'Hello'
     net::HttpRequestHeaders extra_headers;
diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/webkit/browser/blob/blob_url_request_job_factory.cc
index f36e0a5..73efe4c 100644
--- a/webkit/browser/blob/blob_url_request_job_factory.cc
+++ b/webkit/browser/blob/blob_url_request_job_factory.cc
@@ -35,7 +35,7 @@ scoped_ptr<net::URLRequest> BlobProtocolHandler::CreateBlobRequest(
     net::URLRequest::Delegate* request_delegate) {
   const GURL kBlobUrl("blob://see_user_data/");
   scoped_ptr<net::URLRequest> request = request_context->CreateRequest(
-      kBlobUrl, net::DEFAULT_PRIORITY, request_delegate);
+      kBlobUrl, net::DEFAULT_PRIORITY, request_delegate, NULL);
   SetRequestedBlobDataHandle(request.get(), blob_data_handle.Pass());
   return request.Pass();
 }