Misc fixes for gn builds with VS 2015

gpu/command_buffer/client/query_tracker.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 "gpu/command_buffer/client/query_tracker.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 49 matching lines @@
     void* mem = mapped_memory_->Alloc(
         kSyncsPerBucket * sizeof(QuerySync), &shm_id, &shm_offset);
     if (!mem) {
       return false;
     }
     QuerySync* syncs = static_cast<QuerySync*>(mem);
     bucket = new Bucket(syncs, shm_id, shm_offset);
     buckets_.push_back(bucket);
   }
 
-  unsigned short index_in_bucket = 0;
+  size_t index_in_bucket = 0;
   for (size_t i = 0; i < kSyncsPerBucket; i++) {
     if (!bucket->in_use_queries[i]) {
       index_in_bucket = i;
       break;
     }
   }
 
   uint32 shm_offset =
       bucket->base_shm_offset + index_in_bucket * sizeof(QuerySync);
   QuerySync* sync = bucket->syncs + index_in_bucket;
@@ skipping 305 matching lines @@
     if (local_disjoint_count_ != disjoint_count) {
       local_disjoint_count_ = disjoint_count;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu