Index: chrome/browser/ui/webui/policy_ui_browsertest.cc |
diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc |
index 574900329deaefc418689bca7210c06449febf19..1e34b4485a41b2467316e10ae26e00a3843b1f14 100644 |
--- a/chrome/browser/ui/webui/policy_ui_browsertest.cc |
+++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc |
@@ -4,12 +4,15 @@ |
#include <stddef.h> |
+#include <memory> |
+#include <utility> |
#include <vector> |
#include "base/callback.h" |
#include "base/files/scoped_temp_dir.h" |
#include "base/json/json_reader.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/run_loop.h" |
#include "base/values.h" |
#include "chrome/browser/extensions/extension_service.h" |
@@ -211,46 +214,32 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) { |
std::map<std::string, std::string> expected_values; |
// Set the values of four existing policies. |
- base::ListValue* restore_on_startup_urls = new base::ListValue; |
+ std::unique_ptr<base::ListValue> restore_on_startup_urls(new base::ListValue); |
restore_on_startup_urls->Append(new base::StringValue("aaa")); |
restore_on_startup_urls->Append(new base::StringValue("bbb")); |
restore_on_startup_urls->Append(new base::StringValue("ccc")); |
- values.Set(policy::key::kRestoreOnStartupURLs, |
- policy::POLICY_LEVEL_MANDATORY, |
- policy::POLICY_SCOPE_USER, |
- policy::POLICY_SOURCE_CLOUD, |
- restore_on_startup_urls, |
- NULL); |
+ values.Set(policy::key::kRestoreOnStartupURLs, policy::POLICY_LEVEL_MANDATORY, |
+ policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, |
+ std::move(restore_on_startup_urls), nullptr); |
expected_values[policy::key::kRestoreOnStartupURLs] = "aaa,bbb,ccc"; |
- values.Set(policy::key::kHomepageLocation, |
- policy::POLICY_LEVEL_MANDATORY, |
- policy::POLICY_SCOPE_MACHINE, |
- policy::POLICY_SOURCE_CLOUD, |
- new base::StringValue("http://google.com"), |
- NULL); |
+ values.Set(policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY, |
+ policy::POLICY_SCOPE_MACHINE, policy::POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue("http://google.com")), |
+ nullptr); |
expected_values[policy::key::kHomepageLocation] = "http://google.com"; |
- values.Set(policy::key::kRestoreOnStartup, |
- policy::POLICY_LEVEL_RECOMMENDED, |
- policy::POLICY_SCOPE_USER, |
- policy::POLICY_SOURCE_CLOUD, |
- new base::FundamentalValue(4), |
- NULL); |
+ values.Set(policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_RECOMMENDED, |
+ policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::FundamentalValue(4)), nullptr); |
expected_values[policy::key::kRestoreOnStartup] = "4"; |
- values.Set(policy::key::kShowHomeButton, |
- policy::POLICY_LEVEL_RECOMMENDED, |
- policy::POLICY_SCOPE_MACHINE, |
- policy::POLICY_SOURCE_CLOUD, |
- new base::FundamentalValue(true), |
- NULL); |
+ values.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_RECOMMENDED, |
+ policy::POLICY_SCOPE_MACHINE, policy::POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr); |
expected_values[policy::key::kShowHomeButton] = "true"; |
// Set the value of a policy that does not exist. |
const std::string kUnknownPolicy = "NoSuchThing"; |
- values.Set(kUnknownPolicy, |
- policy::POLICY_LEVEL_MANDATORY, |
- policy::POLICY_SCOPE_USER, |
- policy::POLICY_SOURCE_PLATFORM, |
- new base::FundamentalValue(true), |
- NULL); |
+ values.Set(kUnknownPolicy, policy::POLICY_LEVEL_MANDATORY, |
+ policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_PLATFORM, |
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr); |
expected_values[kUnknownPolicy] = "true"; |
UpdateProviderPolicy(values); |