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

components/policy/core/browser/proxy_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 "components/policy/core/browser/proxy_policy_handler.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 237 matching lines @@
   // If there's a server mode, convert it into a mode.
   // When both are specified, the mode takes precedence.
   if (mode) {
     if (server_mode) {
       errors->AddError(key::kProxySettings,
                        key::kProxyServerMode,
                        IDS_POLICY_OVERRIDDEN,
                        key::kProxyMode);
     }
     if (!mode->GetAsString(mode_value)) {
-      errors->AddError(key::kProxySettings,
-                       key::kProxyMode,
+      errors->AddError(key::kProxySettings, key::kProxyMode,
                        IDS_POLICY_TYPE_ERROR,
-                       ValueTypeToString(base::Value::TYPE_BOOLEAN));
+                       base::Value::GetTypeName(base::Value::TYPE_BOOLEAN));
       return false;
     }
 
     ProxyPrefs::ProxyMode mode;
     if (!ProxyPrefs::StringToProxyMode(*mode_value, &mode)) {
       errors->AddError(key::kProxySettings,
                        key::kProxyMode,
                        IDS_POLICY_INVALID_PROXY_MODE_ERROR);
       return false;
     }
 
     if (mode == ProxyPrefs::MODE_PAC_SCRIPT && !pac_url) {
       errors->AddError(key::kProxySettings,
                        key::kProxyPacUrl,
                        IDS_POLICY_NOT_SPECIFIED_ERROR);
       return false;
-    } else if (mode == ProxyPrefs::MODE_FIXED_SERVERS && !server) {
+    }
+    if (mode == ProxyPrefs::MODE_FIXED_SERVERS && !server) {
       errors->AddError(key::kProxySettings,
                        key::kProxyServer,
                        IDS_POLICY_NOT_SPECIFIED_ERROR);
       return false;
     }
   } else if (server_mode) {
     int server_mode_value;
     if (!server_mode->GetAsInteger(&server_mode_value)) {
-      errors->AddError(key::kProxySettings,
-                       key::kProxyServerMode,
+      errors->AddError(key::kProxySettings, key::kProxyServerMode,
                        IDS_POLICY_TYPE_ERROR,
-                       ValueTypeToString(base::Value::TYPE_INTEGER));
+                       base::Value::GetTypeName(base::Value::TYPE_INTEGER));
       return false;
     }
 
     switch (server_mode_value) {
       case PROXY_SERVER_MODE:
         *mode_value = ProxyPrefs::kDirectProxyModeName;
         break;
       case PROXY_AUTO_DETECT_PROXY_SERVER_MODE:
         *mode_value = ProxyPrefs::kAutoDetectProxyModeName;
         break;
@@ skipping 11 matching lines @@
         if (!server && !pac_url) {
           int message_id = IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR;
           errors->AddError(key::kProxySettings,
                            key::kProxyServer,
                            message_id);
           errors->AddError(key::kProxySettings,
                            key::kProxyPacUrl,
                            message_id);
           return false;
         }
-        if (pac_url)
-          *mode_value = ProxyPrefs::kPacScriptProxyModeName;
-        else
-          *mode_value = ProxyPrefs::kFixedServersProxyModeName;
+        *mode_value = pac_url ? ProxyPrefs::kPacScriptProxyModeName
+                              : ProxyPrefs::kFixedServersProxyModeName;
         break;
       case PROXY_USE_SYSTEM_PROXY_SERVER_MODE:
         *mode_value = ProxyPrefs::kSystemProxyModeName;
         break;
       default:
         errors->AddError(key::kProxySettings,
                          key::kProxyServerMode,
                          IDS_POLICY_OUT_OF_RANGE_ERROR,
                          base::IntToString(server_mode_value));
         return false;
     }
   }
   return true;
 }
 
 }  // namespace policy