Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc |
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc |
index 04a8a03972ba19895f8f1925218f8a5310138645..e6231638d252e6a57f1ea1deb1696592a2c3043b 100644 |
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc |
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h" |
#include <set> |
+#include <utility> |
#include "base/bind.h" |
#include "base/command_line.h" |
@@ -66,7 +67,7 @@ scoped_ptr<base::DictionaryValue> CreateDeviceInfo( |
return_value->SetString(kDictionaryKeyDescription, description.description); |
return_value->SetString(kDictionaryKeyType, description.type); |
- return return_value.Pass(); |
+ return return_value; |
} |
void ReadDevicesList( |
@@ -268,7 +269,8 @@ void LocalDiscoveryUIHandler::HandleShowSyncUI( |
void LocalDiscoveryUIHandler::StartRegisterHTTP( |
scoped_ptr<PrivetHTTPClient> http_client) { |
- current_http_client_ = PrivetV1HTTPClient::CreateDefault(http_client.Pass()); |
+ current_http_client_ = |
+ PrivetV1HTTPClient::CreateDefault(std::move(http_client)); |
std::string user = GetSyncAccount(); |