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

chrome/browser/profiles/incognito_mode_policy_handler.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/profiles/incognito_mode_policy_handler.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/prefs/pref_value_map.h"
 #include "grit/components_strings.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
 
 IncognitoModePolicyHandler::IncognitoModePolicyHandler() {}
 
 IncognitoModePolicyHandler::~IncognitoModePolicyHandler() {}
 
 bool IncognitoModePolicyHandler::CheckPolicySettings(const PolicyMap& policies,
                                                      PolicyErrorMap* errors) {
-  int int_value = IncognitoModePrefs::ENABLED;
   const base::Value* availability =
       policies.GetValue(key::kIncognitoModeAvailability);
-
   if (availability) {
-    if (availability->GetAsInteger(&int_value)) {
-      IncognitoModePrefs::Availability availability_enum_value;
-      if (!IncognitoModePrefs::IntToAvailability(int_value,
-                                                 &availability_enum_value)) {
-        errors->AddError(key::kIncognitoModeAvailability,
-                         IDS_POLICY_OUT_OF_RANGE_ERROR,
-                         base::IntToString(int_value));
-        return false;
-      }
-    } else {
-      errors->AddError(key::kIncognitoModeAvailability,
-                       IDS_POLICY_TYPE_ERROR,
-                       ValueTypeToString(base::Value::TYPE_INTEGER));
+    int int_value = IncognitoModePrefs::ENABLED;
+    if (!availability->GetAsInteger(&int_value)) {
+      errors->AddError(key::kIncognitoModeAvailability, IDS_POLICY_TYPE_ERROR,
+                       base::Value::GetTypeName(base::Value::TYPE_INTEGER));
       return false;
     }
-  } else {
-    const base::Value* deprecated_enabled =
-        policies.GetValue(key::kIncognitoEnabled);
-    if (deprecated_enabled &&
-        !deprecated_enabled->IsType(base::Value::TYPE_BOOLEAN)) {
-      errors->AddError(key::kIncognitoEnabled,
-                       IDS_POLICY_TYPE_ERROR,
-                       ValueTypeToString(base::Value::TYPE_BOOLEAN));
+    IncognitoModePrefs::Availability availability_enum_value;
+    if (!IncognitoModePrefs::IntToAvailability(int_value,
+                                               &availability_enum_value)) {
+      errors->AddError(key::kIncognitoModeAvailability,
+                       IDS_POLICY_OUT_OF_RANGE_ERROR,
+                       base::IntToString(int_value));
       return false;
     }
+    return true;
+  }
+
+  const base::Value* deprecated_enabled =
+      policies.GetValue(key::kIncognitoEnabled);
+  if (deprecated_enabled &&
+      !deprecated_enabled->IsType(base::Value::TYPE_BOOLEAN)) {
+    errors->AddError(key::kIncognitoEnabled, IDS_POLICY_TYPE_ERROR,
+                     base::Value::GetTypeName(base::Value::TYPE_BOOLEAN));
+    return false;
   }
   return true;
 }
 
 void IncognitoModePolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
                                                      PrefValueMap* prefs) {
   const base::Value* availability =
       policies.GetValue(key::kIncognitoModeAvailability);
   const base::Value* deprecated_enabled =
       policies.GetValue(key::kIncognitoEnabled);
@@ skipping 16 matching lines @@
       prefs->SetInteger(
           prefs::kIncognitoModeAvailability,
           enabled ? IncognitoModePrefs::ENABLED : IncognitoModePrefs::DISABLED);
     } else {
       NOTREACHED();
     }
   }
 }
 
 }  // namespace policy