Fixes for re-enabling more MSVC level 4 warnings: chrome/ edition

chrome/installer/util/google_update_settings_unittest.cc

 // Copyright (c) 2012 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 <windows.h>
 #include <shlwapi.h>  // For SHDeleteKey.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
@@ skipping 228 matching lines @@
                           KEY_SET_VALUE) == ERROR_SUCCESS) {
       base::string16 app_update_override(
           GoogleUpdateSettings::kUpdateOverrideValuePrefix);
       app_update_override.append(app_guid);
       return policy_key.WriteValue(app_update_override.c_str(),
                                    static_cast<DWORD>(policy)) == ERROR_SUCCESS;
     }
     return false;
   }
 
-  DWORD GetUpdatePolicyForAppGuid(const base::string16& app_guid) {
+  GoogleUpdateSettings::UpdatePolicy GetUpdatePolicyForAppGuid(
+      const base::string16& app_guid) {
     RegKey policy_key;
     if (policy_key.Create(HKEY_LOCAL_MACHINE,
                           GoogleUpdateSettings::kPoliciesKey,
                           KEY_QUERY_VALUE) == ERROR_SUCCESS) {
       base::string16 app_update_override(
           GoogleUpdateSettings::kUpdateOverrideValuePrefix);
       app_update_override.append(app_guid);
 
-      DWORD value = -1;
+      DWORD value;
       if (policy_key.ReadValueDW(app_update_override.c_str(),
                                  &value) == ERROR_SUCCESS) {
-        return value;
+        return static_cast<GoogleUpdateSettings::UpdatePolicy>(value);
       }
     }
-    return -1;
+    return GoogleUpdateSettings::UPDATE_POLICIES_COUNT;
   }
 
   bool SetGlobalUpdatePolicy(GoogleUpdateSettings::UpdatePolicy policy) {
     RegKey policy_key;
     return policy_key.Create(HKEY_LOCAL_MACHINE,
                              GoogleUpdateSettings::kPoliciesKey,
                              KEY_SET_VALUE) == ERROR_SUCCESS &&
            policy_key.WriteValue(GoogleUpdateSettings::kUpdatePolicyValue,
                                  static_cast<DWORD>(policy)) == ERROR_SUCCESS;
   }
 
-  DWORD GetGlobalUpdatePolicy() {
+  GoogleUpdateSettings::UpdatePolicy GetGlobalUpdatePolicy() {
     RegKey policy_key;
-    DWORD value = -1;
+    DWORD value;
     return (policy_key.Create(HKEY_LOCAL_MACHINE,
                               GoogleUpdateSettings::kPoliciesKey,
                               KEY_QUERY_VALUE) == ERROR_SUCCESS &&
             policy_key.ReadValueDW(GoogleUpdateSettings::kUpdatePolicyValue,
-                                   &value) == ERROR_SUCCESS) ? value : -1;
+                                   &value) == ERROR_SUCCESS) ?
+        static_cast<GoogleUpdateSettings::UpdatePolicy>(value) :
+        GoogleUpdateSettings::UPDATE_POLICIES_COUNT;
   }
 
   bool SetUpdateTimeoutOverride(DWORD time_in_minutes) {
     RegKey policy_key;
     return policy_key.Create(HKEY_LOCAL_MACHINE,
                              GoogleUpdateSettings::kPoliciesKey,
                              KEY_SET_VALUE) == ERROR_SUCCESS &&
            policy_key.WriteValue(
                GoogleUpdateSettings::kCheckPeriodOverrideMinutes,
                time_in_minutes) == ERROR_SUCCESS;
@@ skipping 490 matching lines @@
       SetUpdatePolicyForAppGuid(kTestProductGuid,
                                 GoogleUpdateSettings::AUTOMATIC_UPDATES));
   EXPECT_TRUE(SetGlobalUpdatePolicy(GoogleUpdateSettings::UPDATES_DISABLED));
 
   // Make sure we read this as still having updates enabled.
   EXPECT_TRUE(GoogleUpdateSettings::AreAutoupdatesEnabled(kTestProductGuid));
 
   // Make sure that the reset action returns true and is a no-op.
   EXPECT_TRUE(
       GoogleUpdateSettings::ReenableAutoupdatesForApp(kTestProductGuid));
-  EXPECT_EQ(static_cast<DWORD>(GoogleUpdateSettings::AUTOMATIC_UPDATES),
+  EXPECT_EQ(GoogleUpdateSettings::AUTOMATIC_UPDATES,
             GetUpdatePolicyForAppGuid(kTestProductGuid));
-  EXPECT_EQ(static_cast<DWORD>(GoogleUpdateSettings::UPDATES_DISABLED),
-            GetGlobalUpdatePolicy());
+  EXPECT_EQ(GoogleUpdateSettings::UPDATES_DISABLED, GetGlobalUpdatePolicy());
 }
 
 TEST_F(GoogleUpdateSettingsTest, GlobalUpdatesDisabledByPolicy) {
   EXPECT_TRUE(SetGlobalUpdatePolicy(GoogleUpdateSettings::UPDATES_DISABLED));
   bool is_overridden = false;
 
   // The contract for GetAppUpdatePolicy states that |is_overridden| should be
   // set to false when updates are disabled on a non-app-specific basis.
   GoogleUpdateSettings::UpdatePolicy update_policy =
       GoogleUpdateSettings::GetAppUpdatePolicy(kTestProductGuid,
@@ skipping 415 matching lines @@
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::FALSE_SETTING, StatsState::FALSE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::FALSE_SETTING, StatsState::TRUE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::NO_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::FALSE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::TRUE_SETTING)));