Misc fixes for gn builds with VS 2015

google_apis/gcm/base/mcs_util_unittest.cc

Index: google_apis/gcm/base/mcs_util_unittest.cc
diff --git a/google_apis/gcm/base/mcs_util_unittest.cc b/google_apis/gcm/base/mcs_util_unittest.cc
index d51f5a07f7851ef56182b31ccbe80fee69507834..34d482d133e6dace622b8013431beea7b4851833 100644
--- a/google_apis/gcm/base/mcs_util_unittest.cc
+++ b/google_apis/gcm/base/mcs_util_unittest.cc
@@ -31,12 +31,12 @@ TEST(MCSUtilTest, BuildLoginRequest) {
 
 // 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;
   }
 }