bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 165669.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@902 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-11-06 17:13:58 +00:00
parent 1177da898b
commit 255fdad295
28 changed files with 116 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cef1/libcef/browser_request_context.cc
View File

@@ -204,10 +204,7 @@ void BrowserRequestContext::Init(
CreateProxyConfigService(), 0, NULL));
}
storage_.set_host_resolver(
net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
net::HostResolver::kDefaultRetryAttempts,
NULL));
storage_.set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
@@ -254,13 +251,6 @@ void BrowserRequestContext::Init(
net::URLRequestJobFactory* job_factory = new net::URLRequestJobFactoryImpl();
blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
job_factory->SetProtocolHandler(
"blob",
new webkit_blob::BlobProtocolHandler(
blob_storage_controller_.get(),
CefThread::GetMessageLoopProxyForThread(CefThread::FILE)));
BrowserFileSystem* file_system = _Context->file_system();
// Create the context if it doesn't already exist.
file_system->CreateContext();
@@ -269,6 +259,14 @@ void BrowserRequestContext::Init(
"filesystem",
fileapi::CreateFileSystemProtocolHandler(
file_system->file_system_context()));
blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
job_factory->SetProtocolHandler(
"blob",
new webkit_blob::BlobProtocolHandler(
blob_storage_controller_.get(),
file_system->file_system_context(),
CefThread::GetMessageLoopProxyForThread(CefThread::FILE)));
}
storage_.set_job_factory(job_factory);