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

chrome/browser/profiles/incognito_mode_policy_handler.cc

Index: chrome/browser/profiles/incognito_mode_policy_handler.cc
diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.cc b/chrome/browser/profiles/incognito_mode_policy_handler.cc
index fc180cb82d3865735a2959e2f8d955417b5aa192..33c7701f92c8de824ad9e7fb075116ffe256ef3a 100644
--- a/chrome/browser/profiles/incognito_mode_policy_handler.cc
+++ b/chrome/browser/profiles/incognito_mode_policy_handler.cc
@@ -23,36 +23,33 @@ 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;

[Devlin, 2016/07/18 13:29:46]

nit: initialize this value.

[Lei Zhang, 2016/07/19 01:46:17]

Why? The value is used as an out parameter, and then it's value isn't even used.
It's only there because IncognitoModePrefs::IntToAvailability() requires the out
parameter.

[Devlin, 2016/07/19 15:00:07]

Style guide requires variable initialization with declaration.  Agreed that
right now, this doesn't matter, but IMO it's a good practice and protects
against someone later using the variable.  It'd probably never be an issue in
this case, but I still think it's worthwhile rather than trying to dissect all
the possible cases where something could go wrong in the future. :) And, of
course, is there a reason *not* to?

[Lei Zhang, 2016/07/19 19:02:08]

https://google.github.io/styleguide/cppguide.html#Local_Variables says
"initialize variables in the declaration." but I believe the context is for the
example below in the doc. i.e. don't write:

int i; i = f(); but write int i = foo(); instead.

The style guide says nothing about out parameters. Usually for functions that
have an out parameter and return bool, I look at the contract laid out by the
functions. For IntToAvailability(), it says it always sets its out value, so
doing that here is redundent.

[Devlin, 2016/07/19 19:12:38]

Given I'm not an owner here (this was just a drive-by comment), I'm fine with
whatever you decide, and don't want to block this issue on this.

+    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;
 }