[M49_2623] Chromium upversion to m49_2623 branch.
[platform/framework/web/chromium-efl.git] / tizen_src / ewk / efl_integration / url_request_context_getter_efl.cc
index cbb8ee5..03aa1b9 100644 (file)
@@ -68,8 +68,8 @@ URLRequestContextGetterEfl::URLRequestContextGetterEfl(
       io_task_runner_(io_task_runner),
       file_task_runner_(file_task_runner),
       net_log_(net_log),
-      network_delegate_(network_delegate.Pass()),
-      request_interceptors_(request_interceptors.Pass()),
+      network_delegate_(std::move(network_delegate)),
+      request_interceptors_(std::move(request_interceptors)),
       weak_ptr_factory_(this) {
   // Must first be created on the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -121,9 +121,8 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
     // TODO(jam): use v8 if possible, look at chrome code.
     storage_->set_proxy_service(
         net::ProxyService::CreateUsingSystemProxyResolver(
-        proxy_config_service_.Pass(),
-        0,
-        url_request_context_->net_log()));
+            std::move(proxy_config_service_), 0,
+            url_request_context_->net_log()));
 
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_->set_http_auth_handler_factory(
@@ -185,14 +184,14 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
     }
     if (command_line.HasSwitch(switches::kHostResolverRules)) {
       scoped_ptr<net::MappedHostResolver> mapped_host_resolver(
-          new net::MappedHostResolver(host_resolver.Pass()));
+          new net::MappedHostResolver(std::move(host_resolver)));
       mapped_host_resolver->SetRulesFromString(
           command_line.GetSwitchValueASCII(switches::kHostResolverRules));
-      host_resolver = mapped_host_resolver.Pass();
+      host_resolver = std::move(mapped_host_resolver);
     }
 
     // Give |storage_| ownership at the end in case it's |mapped_host_resolver|.
-    storage_->set_host_resolver(host_resolver.Pass());
+    storage_->set_host_resolver(std::move(host_resolver));
     network_session_params.host_resolver =
         url_request_context_->host_resolver();
 
@@ -222,13 +221,13 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
 
     // Set up interceptors in the reverse order.
     scoped_ptr<net::URLRequestJobFactory> top_job_factory =
-        job_factory.Pass();
+        std::move(job_factory);
     for (URLRequestInterceptorScopedVector::reverse_iterator i =
              request_interceptors_.rbegin();
          i != request_interceptors_.rend();
          ++i) {
       top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
-          top_job_factory.Pass(), make_scoped_ptr(*i)));
+          std::move(top_job_factory), make_scoped_ptr(*i)));
     }
     request_interceptors_.weak_clear();