Remove base::FundamentalValue

chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc

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 faed1f02232985d2f995f6ddbb61f5bb45361175..fb3da597612f72ce8fe8b1220a3c0dd14b6e1add 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
@@ -52,8 +52,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));
+  SetPolicyValue(key::kRestoreOnStartup, 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 +76,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 +90,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());
@@ -102,9 +101,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_HomePage) {
 TEST_F(RestoreOnStartupPolicyHandlerTest,
        CheckPolicySettings_RestoreLastSession_SessionCookies) {
   // Specify the Last value and the Session-Only Cookies value.
-  SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(
-                     SessionStartupPref::kPrefValueLast)));
+  SetPolicyValue(
+      key::kRestoreOnStartup,
+      base::WrapUnique(new base::Value(SessionStartupPref::kPrefValueLast)));
   std::unique_ptr<base::ListValue> urls(new base::ListValue);
   urls->AppendString("http://foo.com");
   SetPolicyValue(key::kCookiesSessionOnlyForUrls, std::move(urls));
@@ -122,7 +121,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;
@@ -133,11 +132,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,
-                 base::WrapUnique(new base::FundamentalValue(
-                     SessionStartupPref::kPrefValueLast)));
+  SetPolicyValue(
+      key::kRestoreOnStartup,
+      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());
@@ -151,9 +150,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest,
 TEST_F(RestoreOnStartupPolicyHandlerTest,
        CheckPolicySettings_RestoreLastSession) {
   // Specify the Last value without the conflicts.
-  SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(
-                     SessionStartupPref::kPrefValueLast)));
+  SetPolicyValue(
+      key::kRestoreOnStartup,
+      base::WrapUnique(new base::Value(SessionStartupPref::kPrefValueLast)));
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
   EXPECT_TRUE(errors().empty());
@@ -161,9 +160,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest,
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) {
   // Specify the URLs value.
-  SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(
-                     SessionStartupPref::kPrefValueURLs)));
+  SetPolicyValue(
+      key::kRestoreOnStartup,
+      base::WrapUnique(new base::Value(SessionStartupPref::kPrefValueURLs)));
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
   EXPECT_TRUE(errors().empty());
@@ -171,9 +170,9 @@ TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) {
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_NewTab) {
   // Specify the NewTab value.
-  SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(
-                     SessionStartupPref::kPrefValueNewTab)));
+  SetPolicyValue(
+      key::kRestoreOnStartup,
+      base::WrapUnique(new base::Value(SessionStartupPref::kPrefValueNewTab)));
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
   EXPECT_TRUE(errors().empty());
@@ -188,8 +187,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));
+  SetPolicyValue(key::kRestoreOnStartup, base::MakeUnique<base::Value>(false));
   // The resulting prefs should be empty.
   EXPECT_TRUE(prefs().empty());
 }