mojo: Fix java bindings for maps

Also fix parsing of validation files.

TBR=ppi@chromium.org

Review URL: https://codereview.chromium.org/640223003

Cr-Commit-Position: refs/heads/master@{#299899}

mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java

@@ -62,10 +62,11 @@ public class ValidationTest extends MojoTestCase {
 
     private static String getStringContent(File f) throws FileNotFoundException {
         Scanner scanner = new Scanner(f).useDelimiter("\\Z");
-        if (scanner.hasNext()) {
-            return scanner.next();
+        StringBuilder result = new StringBuilder();
+        while (scanner.hasNext()) {
+            result.append(scanner.next());
         }
-        return "";
+        return result.toString().trim();
     }
 
     private static List<TestData> getTestData(String prefix)

mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl

@@ -28,6 +28,7 @@ if ({{variable}} == null) {
     for (java.util.Map.Entry<{{kind.key_kind|java_type(true)}}, {{kind.value_kind|java_type(true)}}> entry{{level}} : {{variable}}.entrySet()) {
         keys{{level}}[index{{level}}] = entry{{level}}.getKey();
         values{{level}}[index{{level}}] = entry{{level}}.getValue();
+        ++index{{level}};
     }
     {{encode('keys'~level, kind.key_kind|array, 'DataHeader.HEADER_SIZE', 0, level+1, False)|indent(4)}}
     {{encode('values'~level, kind.value_kind|array, 'DataHeader.HEADER_SIZE + org.chromium.mojo.bindings.BindingsHelper.POINTER_SIZE', 0, level+1, False)|indent(4)}}