| Index: chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| diff --git a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| index 421a01d8f32fcae4d16b42d9b53e6203533752a3..5f35e6f5dd8a9802a3e69620f8c617b08639700b 100644
|
| --- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| +++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #include <stdint.h>
|
|
|
| #include <memory>
|
| +#include <utility>
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| @@ -53,7 +54,7 @@ class SettingsOverridePermissionTest : public ChromeManifestTest {
|
| if (flags & kStartupPages) {
|
| std::unique_ptr<base::ListValue> startup_pages(new base::ListValue);
|
| startup_pages->AppendString("http://startup.com/startup.html");
|
| - settings_override->Set("startup_pages", startup_pages.release());
|
| + settings_override->Set("startup_pages", std::move(startup_pages));
|
| }
|
| if (flags & kSearchProvider) {
|
| std::unique_ptr<base::DictionaryValue> search_provider(
|
| @@ -65,10 +66,10 @@ class SettingsOverridePermissionTest : public ChromeManifestTest {
|
| search_provider->SetBoolean("is_default", true);
|
| search_provider->SetString("favicon_url",
|
| "http://wikipedia.org/wiki/Favicon");
|
| - settings_override->Set("search_provider", search_provider.release());
|
| + settings_override->Set("search_provider", std::move(search_provider));
|
| }
|
| - ext_manifest.Set(
|
| - manifest_keys::kSettingsOverride, settings_override.release());
|
| + ext_manifest.Set(manifest_keys::kSettingsOverride,
|
| + std::move(settings_override));
|
|
|
| ManifestData manifest(&ext_manifest, "test");
|
| return LoadAndExpectSuccess(manifest);
|
|
|