Fix bug with using enums as default values in mojom. We were previously

mojo/apps/js/bindings/sample_service_unittests.js

 // 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.
 
 define([
     "console",
     "mojo/apps/js/test/hexdump",
     "gin/test/expect",
     "mojom/sample_service",
     "mojom/sample_import",
-  ], function(console, hexdump, expect, sample, imported) {
+    "mojom/sample_import2",
+  ], function(console, hexdump, expect, sample, imported, imported2) {
 
   var global = this;
 
   // Set this variable to true to print the binary message in hex.
   var dumpMessageAsHex = false;
 
   function makeFoo() {
     var bar = new sample.Bar();
     bar.alpha = 20;
     bar.beta = 40;
@@ skipping 88 matching lines @@
     expect(full.people[0].age).toBe(32);
     expect(full.people[0].names.length).toBe(2);
     expect(full.people[0].names[0]).toBe("Bob");
     expect(full.people[0].names[1]).toBe("Bobby");
     expect(full.people[0].height).toBe(6*12);
 
     expect(full.point.x).toBe(7);
     expect(full.point.y).toBe(15);
 
     expect(full.shape_masks.length).toBe(1);
-    // TODO(mpcomplete): This is broken.
-    // http://crbug.com/320082
-    // expect(full.shape_masks[0]).toBe(1 << imported.Shape.SHAPE_RECTANGLE);
+    expect(full.shape_masks[0]).toBe(1 << imported.Shape.SHAPE_RECTANGLE);
 
-    //expect(full.thing.shape).toBe(imported.Shape.SHAPE_RECTANGLE);
-    //expect(full.thing.color).toBe(imported.Color.COLOR_RED);
+    expect(full.thing.shape).toBe(imported.Shape.SHAPE_CIRCLE);
+    expect(full.thing.color).toBe(imported2.Color.COLOR_BLACK);

[darin (slow to review), 2014/02/13 22:55:21]

Note: it seems like it would be nice if we generated "Color.BLACK" here instead.
Having to type the word "color" twice seems of no value.

Maybe we could address this by changing the way we generate the enum values in
C++. For C++ we could add the prefix so we don't have to figure out how to
subtract it for JS?

For example the following mojom:

  enum Shape {
    CIRCLE,
    ...
  };

Could generate the following C++:

  enum Shape {
    SHAPE_CIRCLE,
    ...
  };

And then in JS it would be:

  Shape.CIRCLE

Looks good?

[Matt Perry, 2014/02/14 19:43:42]

That's definitely doable. It feels a bit.. dirty to me, somehow. I'll file a bug
on it and maybe I'll warm up to it.

   }
 
   function ServiceImpl() {
   }
 
   ServiceImpl.prototype = Object.create(sample.ServiceStub.prototype);
 
   ServiceImpl.prototype.frobinate = function(foo, baz, port) {
     checkFoo(foo);
     expect(baz).toBe(sample.ServiceStub.BazOptions.BAZ_EXTRA);
@@ skipping 16 matching lines @@
   var serviceProxy = new sample.ServiceProxy(receiver);
 
   checkDefaultValues();
 
   var foo = makeFoo();
   checkFoo(foo);
 
   var port = 10;
   serviceProxy.frobinate(foo, sample.ServiceProxy.BazOptions.BAZ_EXTRA, port);
 });