Misc fixes for gn builds with VS 2015

google_apis/gcm/base/mcs_util_unittest.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 "google_apis/gcm/base/mcs_util.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 13 matching lines @@
   ASSERT_EQ(base::Uint64ToString(kAuthToken), login_request->auth_token());
   ASSERT_EQ(base::Uint64ToString(kAuthId), login_request->user());
   ASSERT_EQ("android-3d5c23dac2a1fa7c", login_request->device_id());
   ASSERT_EQ("new_vc", login_request->setting(0).name());
   ASSERT_EQ("1", login_request->setting(0).value());
   // TODO(zea): test the other fields once they have valid values.
 }
 
 // Test building a protobuf and extracting the tag from a protobuf.
 TEST(MCSUtilTest, ProtobufToTag) {
-  for (size_t i = 0; i < kNumProtoTypes; ++i) {
+  for (uint8 i = 0; i < kNumProtoTypes; ++i) {
     scoped_ptr<google::protobuf::MessageLite> protobuf =
         BuildProtobufFromTag(i);
     if (!protobuf.get())  // Not all tags have protobuf definitions.
       continue;
-    ASSERT_EQ((int)i, GetMCSProtoTag(*protobuf)) << "Type " << i;
+    ASSERT_EQ(i, GetMCSProtoTag(*protobuf)) << "Type " << i;
   }
 }
 
 // Test getting and setting persistent ids.
 TEST(MCSUtilTest, PersistentIds) {
   static_assert(kNumProtoTypes == 16U, "Update Persistent Ids");
   const int kTagsWithPersistentIds[] = {
     kIqStanzaTag,
     kDataMessageStanzaTag
   };
@@ skipping 25 matching lines @@
         BuildProtobufFromTag(tag);
     ASSERT_TRUE(protobuf.get());
     SetLastStreamIdReceived(tag, protobuf.get());
     int get_id = GetLastStreamIdReceived(*protobuf);
     ASSERT_EQ(tag, get_id);
   }
 }
 
 }  // namespace
 }  // namespace gcm