clang/win: Let remaining chromium_code targets build with -Wextra.

chrome/installer/gcapi/gcapi_reactivation_test.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 <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
@@ skipping 89 matching lines @@
   EXPECT_TRUE(HasBeenReactivated());
 }
 
 TEST_F(GCAPIReactivationTest, CanOfferReactivation_Basic) {
   DWORD error;
 
   // We're not installed yet. Make sure CanOfferReactivation fails.
   EXPECT_FALSE(CanOfferReactivation(L"GAGA",
                                     GCAPI_INVOKED_STANDARD_SHELL,
                                     &error));
-  EXPECT_EQ(REACTIVATE_ERROR_NOTINSTALLED, error);
+  EXPECT_EQ(static_cast<DWORD>(REACTIVATE_ERROR_NOTINSTALLED), error);
 
   // Now pretend to be installed. CanOfferReactivation should pass.
   EXPECT_TRUE(SetChromeInstallMarker(HKEY_CURRENT_USER));
   EXPECT_TRUE(CanOfferReactivation(L"GAGA",
                                    GCAPI_INVOKED_STANDARD_SHELL,
                                    &error));
 
   // Now set a recent last_run value. CanOfferReactivation should fail again.
   Time hkcu_last_run = Time::NowFromSystemTime() - TimeDelta::FromDays(20);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
   EXPECT_FALSE(CanOfferReactivation(L"GAGA",
                                     GCAPI_INVOKED_STANDARD_SHELL,
                                     &error));
-  EXPECT_EQ(REACTIVATE_ERROR_NOTDORMANT, error);
+  EXPECT_EQ(static_cast<DWORD>(REACTIVATE_ERROR_NOTDORMANT), error);
 
   // Now set a last_run value that exceeds the threshold.
   hkcu_last_run = Time::NowFromSystemTime() -
       TimeDelta::FromDays(kReactivationMinDaysDormant);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
   EXPECT_TRUE(CanOfferReactivation(L"GAGA",
                                    GCAPI_INVOKED_STANDARD_SHELL,
                                    &error));
 
   // Test some invalid inputs
   EXPECT_FALSE(CanOfferReactivation(NULL,
                                     GCAPI_INVOKED_STANDARD_SHELL,
                                     &error));
-  EXPECT_EQ(REACTIVATE_ERROR_INVALID_INPUT, error);
+  EXPECT_EQ(static_cast<DWORD>(REACTIVATE_ERROR_INVALID_INPUT), error);
 
   // One more valid one
   EXPECT_TRUE(CanOfferReactivation(L"GAGA",
                                    GCAPI_INVOKED_STANDARD_SHELL,
                                    &error));
 
   // Check that the previous brands check works:
   EXPECT_TRUE(SetReactivationBrandCode(L"GOOGOO",
                                        GCAPI_INVOKED_STANDARD_SHELL));
   EXPECT_FALSE(CanOfferReactivation(L"GAGA",
                                     GCAPI_INVOKED_STANDARD_SHELL,
                                     &error));
-  EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
+  EXPECT_EQ(static_cast<DWORD>(REACTIVATE_ERROR_ALREADY_REACTIVATED), error);
 }
 
 TEST_F(GCAPIReactivationTest, Reactivation_Flow) {
   DWORD error;
 
   // Set us up as a candidate for reactivation.
   EXPECT_TRUE(SetChromeInstallMarker(HKEY_CURRENT_USER));
 
   Time hkcu_last_run = Time::NowFromSystemTime() -
       TimeDelta::FromDays(kReactivationMinDaysDormant);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA",
                                GCAPI_INVOKED_STANDARD_SHELL,
                                &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   // Make sure we can't reactivate again:
   EXPECT_FALSE(ReactivateChrome(L"GAGA",
                                 GCAPI_INVOKED_STANDARD_SHELL,
                                 &error));
-  EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
+  EXPECT_EQ(static_cast<DWORD>(REACTIVATE_ERROR_ALREADY_REACTIVATED), error);
 
   // Should not be able to reactivate under other brands:
   EXPECT_FALSE(ReactivateChrome(L"MAMA",
                                 GCAPI_INVOKED_STANDARD_SHELL,
                                 &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   // Validate that previous_brands are rejected:
   EXPECT_FALSE(ReactivateChrome(L"PFFT",
                                 GCAPI_INVOKED_STANDARD_SHELL,
                                 &error));
-  EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
+  EXPECT_EQ(static_cast<DWORD>(REACTIVATE_ERROR_ALREADY_REACTIVATED), error);
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 }
 
 TEST_F(GCAPIReactivationTest, ExperimentLabelCheck) {
   DWORD error;
 
   // Set us up as a candidate for reactivation.
   EXPECT_TRUE(SetChromeInstallMarker(HKEY_CURRENT_USER));
 
   Time hkcu_last_run = Time::NowFromSystemTime() -
       TimeDelta::FromDays(kReactivationMinDaysDormant);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA",
                                GCAPI_INVOKED_STANDARD_SHELL,
                                &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   EXPECT_TRUE(HasExperimentLabels(HKEY_CURRENT_USER));
 }