Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: components/proximity_auth/webui/proximity_auth_webui_handler.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/proximity_auth/unlock_manager_unittest.cc ('k') | components/rappor/log_uploader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/proximity_auth/webui/proximity_auth_webui_handler.cc
diff --git a/components/proximity_auth/webui/proximity_auth_webui_handler.cc b/components/proximity_auth/webui/proximity_auth_webui_handler.cc
index 929a1c739cffccc8f4035f8da0f26927a711f7e2..5ef9f17dc1ecd8794108d6f5cf7abf25d5911f05 100644
--- a/components/proximity_auth/webui/proximity_auth_webui_handler.cc
+++ b/components/proximity_auth/webui/proximity_auth_webui_handler.cc
@@ -5,6 +5,7 @@
#include "components/proximity_auth/webui/proximity_auth_webui_handler.h"
#include <algorithm>
+#include <utility>
#include "base/base64url.h"
#include "base/bind.h"
@@ -61,7 +62,7 @@ scoped_ptr<base::DictionaryValue> LogMessageToDictionary(
dictionary->SetInteger(kLogMessageLineKey, log_message.line);
dictionary->SetInteger(kLogMessageSeverityKey,
static_cast<int>(log_message.severity));
- return dictionary.Pass();
+ return dictionary;
}
// Keys in the JSON representation of an ExternalDeviceInfo proto.
@@ -535,7 +536,7 @@ ProximityAuthWebUIHandler::ExternalDeviceInfoToDictionary(
last_remote_status_update_->secure_screen_lock_state);
status_dictionary->SetInteger(
"trustAgent", last_remote_status_update_->trust_agent_state);
- dictionary->Set(kExternalDeviceRemoteState, status_dictionary.Pass());
+ dictionary->Set(kExternalDeviceRemoteState, std::move(status_dictionary));
}
return dictionary;
@@ -552,7 +553,7 @@ ProximityAuthWebUIHandler::IneligibleDeviceToDictionary(
scoped_ptr<base::DictionaryValue> device_dictionary =
ExternalDeviceInfoToDictionary(ineligible_device.device());
device_dictionary->Set(kIneligibleDeviceReasons,
- ineligibility_reasons.Pass());
+ std::move(ineligibility_reasons));
return device_dictionary;
}
« no previous file with comments | « components/proximity_auth/unlock_manager_unittest.cc ('k') | components/rappor/log_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698