Index: chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc |
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc |
index d9d3d2ac24524ba99f8572a3db7daa15e81e8ffe..e3b638cd94e814b4a34bf90684c9760eecb8fe25 100644 |
--- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc |
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc |
@@ -6,8 +6,10 @@ |
#include <memory> |
#include <string> |
+#include <utility> |
#include "base/compiler_specific.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/values.h" |
@@ -27,10 +29,10 @@ namespace policy { |
class RestoreOnStartupPolicyHandlerTest : public testing::Test { |
protected: |
- void SetPolicyValue(const std::string& policy, base::Value* value) { |
- policies_.Set( |
- policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
- value, nullptr); |
+ void SetPolicyValue(const std::string& policy, |
+ std::unique_ptr<base::Value> value) { |
+ policies_.Set(policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
+ POLICY_SOURCE_CLOUD, std::move(value), nullptr); |
} |
bool CheckPolicySettings() { |
return handler_.CheckPolicySettings(policies_, &errors_); |
@@ -50,7 +52,8 @@ class RestoreOnStartupPolicyHandlerTest : public testing::Test { |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_FailsTypeCheck) { |
// Handler expects an int; pass it a bool. |
- SetPolicyValue(key::kRestoreOnStartup, new base::FundamentalValue(false)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue(false))); |
// Checking should fail and add an error to the error map. |
EXPECT_FALSE(CheckPolicySettings()); |
EXPECT_EQ(1U, errors().size()); |
@@ -74,8 +77,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_UnknownValue) { |
int impossible_value = SessionStartupPref::kPrefValueLast + |
SessionStartupPref::kPrefValueURLs + |
SessionStartupPref::kPrefValueNewTab; |
- SetPolicyValue(key::kRestoreOnStartup, |
- new base::FundamentalValue(impossible_value)); |
+ SetPolicyValue( |
+ key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue(impossible_value))); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(1U, errors().size()); |
@@ -87,9 +91,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_UnknownValue) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_HomePage) { |
// Specify the HomePage value. |
- SetPolicyValue( |
- key::kRestoreOnStartup, |
- new base::FundamentalValue(0)); // kPrefValueHomePage, deprecated. |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ // kPrefValueHomePage, deprecated. |
+ base::WrapUnique(new base::FundamentalValue(0))); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(1U, errors().size()); |
@@ -100,12 +104,12 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_HomePage) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, |
CheckPolicySettings_RestoreLastSession_SessionCookies) { |
// Specify the Last value and the Session-Only Cookies value. |
- SetPolicyValue( |
- key::kRestoreOnStartup, |
- new base::FundamentalValue(SessionStartupPref::kPrefValueLast)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue( |
+ SessionStartupPref::kPrefValueLast))); |
std::unique_ptr<base::ListValue> urls(new base::ListValue); |
urls->AppendString("http://foo.com"); |
- SetPolicyValue(key::kCookiesSessionOnlyForUrls, urls.release()); |
+ SetPolicyValue(key::kCookiesSessionOnlyForUrls, std::move(urls)); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(1U, errors().size()); |
@@ -120,7 +124,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NotHomePage) { |
// Specify anything except the HomePage value. |
int not_home_page = 1; // kPrefValueHomePage + 1, deprecated. |
SetPolicyValue(key::kRestoreOnStartup, |
- new base::FundamentalValue(not_home_page)); |
+ base::WrapUnique(new base::FundamentalValue(not_home_page))); |
ApplyPolicySettings(); |
// The resulting prefs should have the value we specified. |
int result; |
@@ -131,10 +135,11 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NotHomePage) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, |
CheckPolicySettings_RestoreLastSession_ClearDataOnExit) { |
// Specify the Last value and the Clear-Data-On-Exit value. |
- SetPolicyValue( |
- key::kRestoreOnStartup, |
- new base::FundamentalValue(SessionStartupPref::kPrefValueLast)); |
- SetPolicyValue(key::kClearSiteDataOnExit, new base::FundamentalValue(true)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue( |
+ SessionStartupPref::kPrefValueLast))); |
+ SetPolicyValue(key::kClearSiteDataOnExit, |
+ base::WrapUnique(new base::FundamentalValue(true))); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(1U, errors().size()); |
@@ -148,9 +153,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, |
TEST_F(RestoreOnStartupPolicyHandlerTest, |
CheckPolicySettings_RestoreLastSession) { |
// Specify the Last value without the conflicts. |
- SetPolicyValue( |
- key::kRestoreOnStartup, |
- new base::FundamentalValue(SessionStartupPref::kPrefValueLast)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue( |
+ SessionStartupPref::kPrefValueLast))); |
// Checking should succeed with no errors. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(0U, errors().size()); |
@@ -158,9 +163,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) { |
// Specify the URLs value. |
- SetPolicyValue( |
- key::kRestoreOnStartup, |
- new base::FundamentalValue(SessionStartupPref::kPrefValueURLs)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue( |
+ SessionStartupPref::kPrefValueURLs))); |
// Checking should succeed with no errors. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(0U, errors().size()); |
@@ -168,9 +173,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_NewTab) { |
// Specify the NewTab value. |
- SetPolicyValue( |
- key::kRestoreOnStartup, |
- new base::FundamentalValue(SessionStartupPref::kPrefValueNewTab)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue( |
+ SessionStartupPref::kPrefValueNewTab))); |
// Checking should succeed with no errors. |
EXPECT_TRUE(CheckPolicySettings()); |
EXPECT_EQ(0U, errors().size()); |
@@ -185,7 +190,8 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NoValue) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_WrongType) { |
// Handler expects an int; pass it a bool. |
- SetPolicyValue(key::kRestoreOnStartup, new base::FundamentalValue(false)); |
+ SetPolicyValue(key::kRestoreOnStartup, |
+ base::WrapUnique(new base::FundamentalValue(false))); |
// The resulting prefs should be empty. |
EXPECT_TRUE(prefs().begin() == prefs().end()); |
} |