| Index: chrome/browser/devtools/devtools_network_controller.cc
|
| diff --git a/chrome/browser/devtools/devtools_network_controller.cc b/chrome/browser/devtools/devtools_network_controller.cc
|
| index d9021e293814ac8919890f77dfc84fc2cba4f8dc..b83ac970f59e01774b749db76266c30c89310f59 100644
|
| --- a/chrome/browser/devtools/devtools_network_controller.cc
|
| +++ b/chrome/browser/devtools/devtools_network_controller.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/devtools/devtools_network_controller.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "chrome/browser/devtools/devtools_network_conditions.h"
|
| #include "chrome/browser/devtools/devtools_network_interceptor.h"
|
| #include "net/http/http_request_info.h"
|
| @@ -40,16 +42,16 @@ void DevToolsNetworkController::SetNetworkState(
|
| return;
|
| scoped_ptr<DevToolsNetworkInterceptor> new_interceptor(
|
| new DevToolsNetworkInterceptor());
|
| - new_interceptor->UpdateConditions(conditions.Pass());
|
| - interceptors_.set(client_id, new_interceptor.Pass());
|
| + new_interceptor->UpdateConditions(std::move(conditions));
|
| + interceptors_.set(client_id, std::move(new_interceptor));
|
| } else {
|
| if (!conditions) {
|
| scoped_ptr<DevToolsNetworkConditions> online_conditions(
|
| new DevToolsNetworkConditions());
|
| - interceptor->UpdateConditions(online_conditions.Pass());
|
| + interceptor->UpdateConditions(std::move(online_conditions));
|
| interceptors_.erase(client_id);
|
| } else {
|
| - interceptor->UpdateConditions(conditions.Pass());
|
| + interceptor->UpdateConditions(std::move(conditions));
|
| }
|
| }
|
|
|
| @@ -66,6 +68,6 @@ void DevToolsNetworkController::SetNetworkState(
|
| if (is_appcache_offline != has_offline_interceptors) {
|
| scoped_ptr<DevToolsNetworkConditions> appcache_conditions(
|
| new DevToolsNetworkConditions(has_offline_interceptors));
|
| - appcache_interceptor_->UpdateConditions(appcache_conditions.Pass());
|
| + appcache_interceptor_->UpdateConditions(std::move(appcache_conditions));
|
| }
|
| }
|
|
|