Update to Chromium revision fc6aaca4 (#406441)

This commit is contained in:
Marshall Greenblatt
2016-07-21 17:21:32 -04:00
parent d92bc1d200
commit 98f59f47fd
79 changed files with 478 additions and 402 deletions

View File

@ -65,7 +65,7 @@ class BytesElementReader : public net::UploadBytesElementReader {
};
base::TaskRunner* GetFileTaskRunner() {
return content::BrowserThread::GetMessageLoopProxyForThread(
return content::BrowserThread::GetTaskRunnerForThread(
content::BrowserThread::FILE).get();
}
@ -559,7 +559,6 @@ void CefRequestImpl::Set(const blink::WebURLRequest& request) {
void CefRequestImpl::Get(blink::WebURLRequest& request,
int64& upload_data_size) const {
request.initialize();
base::AutoLock lock_scope(lock_);
request.setURL(GURL(url_.ToString()));
@ -614,8 +613,6 @@ void CefRequestImpl::Get(blink::WebURLRequest& request,
// static
void CefRequestImpl::Get(const CefMsg_LoadRequest_Params& params,
blink::WebURLRequest& request) {
request.initialize();
request.setURL(params.url);
if (!params.method.empty())
request.setHTTPMethod(base::ASCIIToUTF16(params.method));