| Index: content/shell/browser/shell_browser_context.cc
|
| diff --git a/content/shell/browser/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc
|
| index 3195800145d28ae0665818b91ac4f4b77a469361..492eb8bff7a913a204be021acf3b16112c3f0223 100644
|
| --- a/content/shell/browser/shell_browser_context.cc
|
| +++ b/content/shell/browser/shell_browser_context.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/shell/browser/shell_browser_context.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/environment.h"
|
| @@ -129,13 +131,10 @@ ShellBrowserContext::CreateURLRequestContextGetter(
|
| ProtocolHandlerMap* protocol_handlers,
|
| URLRequestInterceptorScopedVector request_interceptors) {
|
| return new ShellURLRequestContextGetter(
|
| - ignore_certificate_errors_,
|
| - GetPath(),
|
| + ignore_certificate_errors_, GetPath(),
|
| BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
|
| BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
|
| - protocol_handlers,
|
| - request_interceptors.Pass(),
|
| - net_log_);
|
| + protocol_handlers, std::move(request_interceptors), net_log_);
|
| }
|
|
|
| net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
|
| @@ -143,7 +142,7 @@ net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
|
| URLRequestInterceptorScopedVector request_interceptors) {
|
| DCHECK(!url_request_getter_.get());
|
| url_request_getter_ = CreateURLRequestContextGetter(
|
| - protocol_handlers, request_interceptors.Pass());
|
| + protocol_handlers, std::move(request_interceptors));
|
| resource_context_->set_url_request_context_getter(url_request_getter_.get());
|
| return url_request_getter_.get();
|
| }
|
|
|