Switch various ValueTypeToString()s to base::Value::GetTypeName().

chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 35 matching lines @@
  private:
   PolicyMap policies_;
   PolicyErrorMap errors_;
   PrefValueMap prefs_;
   RestoreOnStartupPolicyHandler handler_;
 };
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_FailsTypeCheck) {
   // Handler expects an int; pass it a bool.
   SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(false)));
+                 base::MakeUnique<base::FundamentalValue>(false));
   // Checking should fail and add an error to the error map.
   EXPECT_FALSE(CheckPolicySettings());
-  EXPECT_EQ(1U, errors().size());
-  EXPECT_EQ(l10n_util::GetStringFUTF16(
-                IDS_POLICY_TYPE_ERROR,
-                base::ASCIIToUTF16(
-                    ConfigurationPolicyHandler::ValueTypeToString(
-                        base::Value::TYPE_INTEGER))),
-            errors().begin()->second);
+  ASSERT_EQ(1U, errors().size());
+  EXPECT_EQ(
+      l10n_util::GetStringFUTF16(IDS_POLICY_TYPE_ERROR,
+                                 base::ASCIIToUTF16(base::Value::GetTypeName(
+                                     base::Value::TYPE_INTEGER))),
+      errors().begin()->second);
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_Unspecified) {
   // Don't specify a value for the policy.
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(0U, errors().size());
+  EXPECT_TRUE(errors().empty());
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_UnknownValue) {
   // Specify an unknown value for the policy.
   int impossible_value = SessionStartupPref::kPrefValueLast +
                          SessionStartupPref::kPrefValueURLs +
                          SessionStartupPref::kPrefValueNewTab;
-  SetPolicyValue(
-      key::kRestoreOnStartup,
-      base::WrapUnique(new base::FundamentalValue(impossible_value)));
+  SetPolicyValue(key::kRestoreOnStartup,
+                 base::MakeUnique<base::FundamentalValue>(impossible_value));
   // Checking should succeed but add an error to the error map.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(1U, errors().size());
+  ASSERT_EQ(1U, errors().size());
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_POLICY_OUT_OF_RANGE_ERROR,
                 base::ASCIIToUTF16(base::IntToString(impossible_value))),
             errors().begin()->second);
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_HomePage) {
   // Specify the HomePage value.
   SetPolicyValue(key::kRestoreOnStartup,
                  // kPrefValueHomePage, deprecated.
-                 base::WrapUnique(new base::FundamentalValue(0)));
+                 base::MakeUnique<base::FundamentalValue>(0));
   // Checking should succeed but add an error to the error map.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(1U, errors().size());
+  ASSERT_EQ(1U, errors().size());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_POLICY_VALUE_DEPRECATED),
             errors().begin()->second);
 }
 
 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)));
   std::unique_ptr<base::ListValue> urls(new base::ListValue);
   urls->AppendString("http://foo.com");
   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());
-  EXPECT_TRUE(key::kCookiesSessionOnlyForUrls == errors().begin()->first);
+  ASSERT_EQ(1U, errors().size());
+  EXPECT_EQ(key::kCookiesSessionOnlyForUrls, errors().begin()->first);
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_POLICY_OVERRIDDEN,
                 base::ASCIIToUTF16(key::kRestoreOnStartup)),
             errors().begin()->second);
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NotHomePage) {
   // Specify anything except the HomePage value.
   int not_home_page = 1;  // kPrefValueHomePage + 1, deprecated.
   SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(not_home_page)));
+                 base::MakeUnique<base::FundamentalValue>(not_home_page));
   ApplyPolicySettings();
   // The resulting prefs should have the value we specified.
   int result;
   EXPECT_TRUE(prefs().GetInteger(prefs::kRestoreOnStartup, &result));
   EXPECT_EQ(not_home_page, result);
 }
 
 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::kClearSiteDataOnExit,
-                 base::WrapUnique(new base::FundamentalValue(true)));
+                 base::MakeUnique<base::FundamentalValue>(true));
   // Checking should succeed but add an error to the error map.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(1U, errors().size());
-  EXPECT_TRUE(key::kClearSiteDataOnExit == errors().begin()->first);
+  ASSERT_EQ(1U, errors().size());
+  EXPECT_EQ(key::kClearSiteDataOnExit, errors().begin()->first);
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_POLICY_OVERRIDDEN,
                 base::ASCIIToUTF16(key::kRestoreOnStartup)),
             errors().begin()->second);
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest,
        CheckPolicySettings_RestoreLastSession) {
   // Specify the Last value without the conflicts.
   SetPolicyValue(key::kRestoreOnStartup,
                  base::WrapUnique(new base::FundamentalValue(
                      SessionStartupPref::kPrefValueLast)));
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(0U, errors().size());
+  EXPECT_TRUE(errors().empty());
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_URLs) {
   // Specify the URLs value.
   SetPolicyValue(key::kRestoreOnStartup,
                  base::WrapUnique(new base::FundamentalValue(
                      SessionStartupPref::kPrefValueURLs)));
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(0U, errors().size());
+  EXPECT_TRUE(errors().empty());
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, CheckPolicySettings_NewTab) {
   // Specify the NewTab value.
   SetPolicyValue(key::kRestoreOnStartup,
                  base::WrapUnique(new base::FundamentalValue(
                      SessionStartupPref::kPrefValueNewTab)));
   // Checking should succeed with no errors.
   EXPECT_TRUE(CheckPolicySettings());
-  EXPECT_EQ(0U, errors().size());
+  EXPECT_TRUE(errors().empty());
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_NoValue) {
   // Don't specify a value for the policy.
   ApplyPolicySettings();
   // The resulting prefs should be empty.
-  EXPECT_TRUE(prefs().begin() == prefs().end());
+  EXPECT_TRUE(prefs().empty());
 }
 
 TEST_F(RestoreOnStartupPolicyHandlerTest, ApplyPolicySettings_WrongType) {
   // Handler expects an int; pass it a bool.
   SetPolicyValue(key::kRestoreOnStartup,
-                 base::WrapUnique(new base::FundamentalValue(false)));
+                 base::MakeUnique<base::FundamentalValue>(false));
   // The resulting prefs should be empty.
-  EXPECT_TRUE(prefs().begin() == prefs().end());
+  EXPECT_TRUE(prefs().empty());
 }
 
 }  // namespace policy