Even more win64 warning fixes

tests/ToUnicodeTest.cpp

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkPDFFont.h"
 #include "SkPDFTypes.h"
@@ skipping 131 matching lines @@
                                             buffer.getOffset()));
 
     glyphToUnicode.reset();
     glyphsInSubset.reset();
     SkPDFGlyphSet subset2;
 
     // Test mapping:
     //           I  n  s  t  a  l
     // Glyph id 2c 51 56 57 44 4f
     // Unicode  49 6e 73 74 61 6c
-    for (size_t i = 0; i < 100; ++i) {
+    for (SkUnichar i = 0; i < 100; ++i) {
       glyphToUnicode.push(i + 29);
     }
 
     glyphsInSubset.push(0x2C);
     glyphsInSubset.push(0x44);
     glyphsInSubset.push(0x4F);
     glyphsInSubset.push(0x51);
     glyphsInSubset.push(0x56);
     glyphsInSubset.push(0x57);
 
     SkDynamicMemoryWStream buffer2;
     subset2.set(glyphsInSubset.begin(), glyphsInSubset.count());
     append_cmap_sections(glyphToUnicode, &subset2, &buffer2, true, 0, 0xffff);
 
     char expectedResult2[] =
 "4 beginbfchar\n\
 <002C> <0049>\n\
 <0044> <0061>\n\
 <004F> <006C>\n\
 <0051> <006E>\n\
 endbfchar\n\
 1 beginbfrange\n\
 <0056> <0057> <0073>\n\
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer2, 0, expectedResult2,
                                             buffer2.getOffset()));
 }