| Index: components/policy/core/common/preg_parser_win_unittest.cc
|
| diff --git a/components/policy/core/common/preg_parser_win_unittest.cc b/components/policy/core/common/preg_parser_win_unittest.cc
|
| index d6b71b6e097b78827f53b179dd5f89b1d3fabeef..220062ecb4f1bbfe06869f49c97df34f8cb2955b 100644
|
| --- a/components/policy/core/common/preg_parser_win_unittest.cc
|
| +++ b/components/policy/core/common/preg_parser_win_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/policy/core/common/preg_parser_win.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/base_paths.h"
|
| #include "base/files/file_path.h"
|
| #include "base/json/json_writer.h"
|
| @@ -80,13 +82,13 @@ TEST(PRegParserWinTest, TestParseFile) {
|
| dict.SetKey("DeleteKeysTest1", make_scoped_ptr(new RegistryDict()));
|
| scoped_ptr<RegistryDict> delete_keys_test(new RegistryDict());
|
| SetInteger(delete_keys_test.get(), "DeleteKeysTest2Entry", 1);
|
| - dict.SetKey("DeleteKeysTest2", delete_keys_test.Pass());
|
| + dict.SetKey("DeleteKeysTest2", std::move(delete_keys_test));
|
| SetInteger(&dict, "DelTest", 1);
|
| scoped_ptr<RegistryDict> subdict(new RegistryDict());
|
| SetInteger(subdict.get(), "DelValsTest1", 1);
|
| SetString(subdict.get(), "DelValsTest2", "2");
|
| subdict->SetKey("DelValsTest3", make_scoped_ptr(new RegistryDict()));
|
| - dict.SetKey("DelValsTest", subdict.Pass());
|
| + dict.SetKey("DelValsTest", std::move(subdict));
|
|
|
| // Run the parser.
|
| base::FilePath test_file(
|
| @@ -99,14 +101,14 @@ TEST(PRegParserWinTest, TestParseFile) {
|
| RegistryDict expected;
|
| scoped_ptr<RegistryDict> del_vals_dict(new RegistryDict());
|
| del_vals_dict->SetKey("DelValsTest3", make_scoped_ptr(new RegistryDict()));
|
| - expected.SetKey("DelValsTest", del_vals_dict.Pass());
|
| + expected.SetKey("DelValsTest", std::move(del_vals_dict));
|
| SetInteger(&expected, "HomepageIsNewTabPage", 1);
|
| SetString(&expected, "HomepageLocation", "http://www.example.com");
|
| SetInteger(&expected, "RestoreOnStartup", 4);
|
| scoped_ptr<RegistryDict> startup_urls(new RegistryDict());
|
| SetString(startup_urls.get(), "1", "http://www.chromium.org");
|
| SetString(startup_urls.get(), "2", "http://www.example.com");
|
| - expected.SetKey("RestoreOnStartupURLs", startup_urls.Pass());
|
| + expected.SetKey("RestoreOnStartupURLs", std::move(startup_urls));
|
| SetInteger(&expected, "ShowHomeButton", 1);
|
| SetString(&expected, "Snowman", "\xE2\x98\x83");
|
| SetString(&expected, "Empty", "");
|
|
|