Add ShellNetworkDelegate so content_shell can use cookies (again)

content/shell/shell_url_request_context_getter.cc

 // 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.
 
 #include "content/shell/shell_url_request_context_getter.h"
 
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/shell/shell_network_delegate.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/default_server_bound_cert_store.h"
 #include "net/base/host_resolver.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_service.h"
@@ skipping 22 matching lines @@
 }
 
 ShellURLRequestContextGetter::~ShellURLRequestContextGetter() {
 }
 
 net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!url_request_context_) {
     url_request_context_ = new net::URLRequestContext();
+    network_delegate_.reset(new ShellNetworkDelegate);
+    url_request_context_->set_network_delegate(network_delegate_.get());
     storage_.reset(new net::URLRequestContextStorage(url_request_context_));
-
     storage_->set_cookie_store(new net::CookieMonster(NULL, NULL));
     storage_->set_server_bound_cert_service(new net::ServerBoundCertService(
         new net::DefaultServerBoundCertStore(NULL)));
     url_request_context_->set_accept_language("en-us,en");
     url_request_context_->set_accept_charset("iso-8859-1,*,utf-8");
 
     storage_->set_host_resolver(
         net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
                                       net::HostResolver::kDefaultRetryAttempts,
                                       NULL));
@@ skipping 21 matching lines @@
 
     net::HttpCache* main_cache = new net::HttpCache(
         url_request_context_->host_resolver(),
         url_request_context_->cert_verifier(),
         url_request_context_->server_bound_cert_service(),
         NULL, // tranport_security_state
         url_request_context_->proxy_service(),
         "", // ssl_session_cache_shard
         url_request_context_->ssl_config_service(),
         url_request_context_->http_auth_handler_factory(),
-        NULL,  // network_delegate
+        url_request_context_->network_delegate(),
         url_request_context_->http_server_properties(),
         NULL,
         main_backend);
     storage_->set_http_transaction_factory(main_cache);
 
     storage_->set_job_factory(new net::URLRequestJobFactory);
   }
 
   return url_request_context_;
 }
 
 scoped_refptr<base::MessageLoopProxy>
     ShellURLRequestContextGetter::GetIOMessageLoopProxy() const {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
 }
 
 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
   return url_request_context_->host_resolver();
 }
 
 }  // namespace content