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 737f66bc946fed2485a12948c05dc00be7d7a69a..dd3644a67853bbb6fb8618a858ec36ed070e122f 100644 |
--- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc |
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc |
@@ -53,7 +53,7 @@ class RestoreOnStartupPolicyHandlerTest : public testing::Test { |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_FailsTypeCheck) { |
// Handler expects an int; pass it a bool. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::MakeUnique<base::FundamentalValue>(false)); |
+ base::MakeUnique<base::Value>(false)); |
// Checking should fail and add an error to the error map. |
EXPECT_FALSE(CheckPolicySettings()); |
ASSERT_EQ(1U, errors().size()); |
@@ -77,7 +77,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_UnknownValue) { |
SessionStartupPref::kPrefValueURLs + |
SessionStartupPref::kPrefValueNewTab; |
SetPolicyValue(key::kRestoreOnStartup, |
- base::MakeUnique<base::FundamentalValue>(impossible_value)); |
+ base::MakeUnique<base::Value>(impossible_value)); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
ASSERT_EQ(1U, errors().size()); |
@@ -91,7 +91,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_HomePage) { |
// Specify the HomePage value. |
SetPolicyValue(key::kRestoreOnStartup, |
// kPrefValueHomePage, deprecated. |
- base::MakeUnique<base::FundamentalValue>(0)); |
+ base::MakeUnique<base::Value>(0)); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
ASSERT_EQ(1U, errors().size()); |
@@ -103,7 +103,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, |
CheckPolicySettings_RestoreLastSession_SessionCookies) { |
// Specify the Last value and the Session-Only Cookies value. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::WrapUnique(new base::FundamentalValue( |
+ base::WrapUnique(new base::Value( |
SessionStartupPref::kPrefValueLast))); |
std::unique_ptr<base::ListValue> urls(new base::ListValue); |
urls->AppendString("http://foo.com"); |
@@ -122,7 +122,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NotHomePage) { |
// Specify anything except the HomePage value. |
int not_home_page = 1; // kPrefValueHomePage + 1, deprecated. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::MakeUnique<base::FundamentalValue>(not_home_page)); |
+ base::MakeUnique<base::Value>(not_home_page)); |
ApplyPolicySettings(); |
// The resulting prefs should have the value we specified. |
int result; |
@@ -134,10 +134,10 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, |
CheckPolicySettings_RestoreLastSession_ClearDataOnExit) { |
// Specify the Last value and the Clear-Data-On-Exit value. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::WrapUnique(new base::FundamentalValue( |
+ base::WrapUnique(new base::Value( |
SessionStartupPref::kPrefValueLast))); |
SetPolicyValue(key::kClearSiteDataOnExit, |
- base::MakeUnique<base::FundamentalValue>(true)); |
+ base::MakeUnique<base::Value>(true)); |
// Checking should succeed but add an error to the error map. |
EXPECT_TRUE(CheckPolicySettings()); |
ASSERT_EQ(1U, errors().size()); |
@@ -152,7 +152,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, |
CheckPolicySettings_RestoreLastSession) { |
// Specify the Last value without the conflicts. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::WrapUnique(new base::FundamentalValue( |
+ base::WrapUnique(new base::Value( |
SessionStartupPref::kPrefValueLast))); |
// Checking should succeed with no errors. |
EXPECT_TRUE(CheckPolicySettings()); |
@@ -162,7 +162,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) { |
// Specify the URLs value. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::WrapUnique(new base::FundamentalValue( |
+ base::WrapUnique(new base::Value( |
SessionStartupPref::kPrefValueURLs))); |
// Checking should succeed with no errors. |
EXPECT_TRUE(CheckPolicySettings()); |
@@ -172,7 +172,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_NewTab) { |
// Specify the NewTab value. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::WrapUnique(new base::FundamentalValue( |
+ base::WrapUnique(new base::Value( |
SessionStartupPref::kPrefValueNewTab))); |
// Checking should succeed with no errors. |
EXPECT_TRUE(CheckPolicySettings()); |
@@ -189,7 +189,7 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NoValue) { |
TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_WrongType) { |
// Handler expects an int; pass it a bool. |
SetPolicyValue(key::kRestoreOnStartup, |
- base::MakeUnique<base::FundamentalValue>(false)); |
+ base::MakeUnique<base::Value>(false)); |
// The resulting prefs should be empty. |
EXPECT_TRUE(prefs().empty()); |
} |