| Index: chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
|
| diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
|
| index 5672fa8546444360170274aa5b06a7ad54a7d44e..4fa0f3e86dafecf6600b3e3cd6d4c09b84bc3c6b 100644
|
| --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
|
| +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/callback.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -23,7 +25,7 @@ namespace test {
|
| void ExternalDataFetchCallback(scoped_ptr<std::string>* destination,
|
| const base::Closure& done_callback,
|
| scoped_ptr<std::string> data) {
|
| - *destination = data.Pass();
|
| + *destination = std::move(data);
|
| done_callback.Run();
|
| }
|
|
|
| @@ -35,7 +37,7 @@ scoped_ptr<base::DictionaryValue> ConstructExternalDataReference(
|
| metadata->SetStringWithoutPathExpansion("url", url);
|
| metadata->SetStringWithoutPathExpansion("hash", base::HexEncode(hash.c_str(),
|
| hash.size()));
|
| - return metadata.Pass();
|
| + return metadata;
|
| }
|
|
|
| void SetExternalDataReference(CloudPolicyCore* core,
|
|
|