Mojo: more idiomatic C++ bindings

mojo/public/cpp/bindings/tests/sample_service_unittest.cc

Index: mojo/public/cpp/bindings/tests/sample_service_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/sample_service_unittest.cc b/mojo/public/cpp/bindings/tests/sample_service_unittest.cc
index a93eb71cfb5be98e44fcf9cdc657eaa01309d418..1c6220ffde85da469d33a6ec6fa3a8106e43da03 100644
--- a/mojo/public/cpp/bindings/tests/sample_service_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/sample_service_unittest.cc
@@ -6,23 +6,19 @@
 #include <ostream>
 #include <string>
 
-#include "mojo/public/cpp/bindings/allocation_scope.h"
-#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/interfaces/bindings/tests/sample_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
 template <>
-class TypeConverter<sample::Bar, int32_t> {
+class TypeConverter<sample::BarPtr, int32_t> {
  public:
-  static int32_t ConvertTo(const sample::Bar& bar) {
-    return static_cast<int32_t>(bar.alpha()) << 16 |
-           static_cast<int32_t>(bar.beta()) << 8 |
-           static_cast<int32_t>(bar.gamma());
+  static int32_t ConvertTo(const sample::BarPtr& bar) {
+    return static_cast<int32_t>(bar->alpha) << 16 |
+           static_cast<int32_t>(bar->beta) << 8 |
+           static_cast<int32_t>(bar->gamma);
   }
-
-  MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
 };
 
 }  // namespace mojo
@@ -37,33 +33,33 @@ bool g_dump_message_as_hex = false;
 bool g_dump_message_as_text = false;
 
 // Make a sample |Foo|.
-Foo MakeFoo() {
+FooPtr MakeFoo() {
   mojo::String name("foopy");
 
-  Bar::Builder bar;
-  bar.set_alpha(20);
-  bar.set_beta(40);
-  bar.set_gamma(60);
-  bar.set_type(Bar::TYPE_VERTICAL);
+  BarPtr bar(Bar::New());
+  bar->alpha = 20;
+  bar->beta = 40;
+  bar->gamma = 60;
+  bar->type = Bar::TYPE_VERTICAL;
 
-  mojo::Array<Bar>::Builder extra_bars(3);
+  mojo::Array<BarPtr> extra_bars(3);
   for (size_t i = 0; i < extra_bars.size(); ++i) {
     Bar::Type type = i % 2 == 0 ? Bar::TYPE_VERTICAL : Bar::TYPE_HORIZONTAL;
-    Bar::Builder bar;
+    BarPtr bar(Bar::New());
     uint8_t base = static_cast<uint8_t>(i * 100);
-    bar.set_alpha(base);
-    bar.set_beta(base + 20);
-    bar.set_gamma(base + 40);
-    bar.set_type(type);
-    extra_bars[i] = bar.Finish();
+    bar->alpha = base;
+    bar->beta = base + 20;
+    bar->gamma = base + 40;
+    bar->type = type;
+    extra_bars[i] = bar.Pass();
   }
 
-  mojo::Array<uint8_t>::Builder data(10);
+  mojo::Array<uint8_t> data(10);
   for (size_t i = 0; i < data.size(); ++i)
     data[i] = static_cast<uint8_t>(data.size() - i);
 
-  mojo::Array<mojo::DataPipeConsumerHandle>::Builder input_streams(2);
-  mojo::Array<mojo::DataPipeProducerHandle>::Builder output_streams(2);
+  mojo::Array<mojo::ScopedDataPipeConsumerHandle> input_streams(2);
+  mojo::Array<mojo::ScopedDataPipeProducerHandle> output_streams(2);
   for (size_t i = 0; i < input_streams.size(); ++i) {
     MojoCreateDataPipeOptions options;
     options.struct_size = sizeof(MojoCreateDataPipeOptions);
@@ -77,85 +73,84 @@ Foo MakeFoo() {
     output_streams[i] = producer.Pass();
   }
 
-  mojo::Array<mojo::Array<bool> >::Builder array_of_array_of_bools(2);
+  mojo::Array<mojo::Array<bool> > array_of_array_of_bools(2);
   for (size_t i = 0; i < 2; ++i) {
-    mojo::Array<bool>::Builder array_of_bools(2);
-    for (size_t j = 0; j < 2; ++j) {
+    mojo::Array<bool> array_of_bools(2);
+    for (size_t j = 0; j < 2; ++j)
       array_of_bools[j] = j;
-    }
-    array_of_array_of_bools[i] = array_of_bools.Finish();
+    array_of_array_of_bools[i] = array_of_bools.Pass();
   }
 
   mojo::ScopedMessagePipeHandle pipe0, pipe1;
   mojo::CreateMessagePipe(&pipe0, &pipe1);
 
-  Foo::Builder foo;
-  foo.set_name(name);
-  foo.set_x(1);
-  foo.set_y(2);
-  foo.set_a(false);
-  foo.set_b(true);
-  foo.set_c(false);
-  foo.set_bar(bar.Finish());
-  foo.set_extra_bars(extra_bars.Finish());
-  foo.set_data(data.Finish());
-  foo.set_source(pipe1.Pass());
-  foo.set_input_streams(input_streams.Finish());
-  foo.set_output_streams(output_streams.Finish());
-  foo.set_array_of_array_of_bools(array_of_array_of_bools.Finish());
-
-  return foo.Finish();
+  FooPtr foo(Foo::New());
+  foo->name = name;
+  foo->x = 1;
+  foo->y = 2;
+  foo->a = false;
+  foo->b = true;
+  foo->c = false;
+  foo->bar = bar.Pass();
+  foo->extra_bars = extra_bars.Pass();
+  foo->data = data.Pass();
+  foo->source = pipe1.Pass();
+  foo->input_streams = input_streams.Pass();
+  foo->output_streams = output_streams.Pass();
+  foo->array_of_array_of_bools = array_of_array_of_bools.Pass();
+
+  return foo.Pass();
 }
 
 // Check that the given |Foo| is identical to the one made by |MakeFoo()|.
 void CheckFoo(const Foo& foo) {
   const std::string kName("foopy");
-  ASSERT_FALSE(foo.name().is_null());
-  EXPECT_EQ(kName.size(), foo.name().size());
-  for (size_t i = 0; i < std::min(kName.size(), foo.name().size()); i++) {
+  ASSERT_FALSE(foo.name.is_null());
+  EXPECT_EQ(kName.size(), foo.name.size());
+  for (size_t i = 0; i < std::min(kName.size(), foo.name.size()); i++) {
     // Test both |operator[]| and |at|.
-    EXPECT_EQ(kName[i], foo.name().at(i)) << i;
-    EXPECT_EQ(kName[i], foo.name()[i]) << i;
+    EXPECT_EQ(kName[i], foo.name.at(i)) << i;
+    EXPECT_EQ(kName[i], foo.name[i]) << i;
   }
-  EXPECT_EQ(kName, foo.name().To<std::string>());
+  EXPECT_EQ(kName, foo.name.get());
 
-  EXPECT_EQ(1, foo.x());
-  EXPECT_EQ(2, foo.y());
-  EXPECT_FALSE(foo.a());
-  EXPECT_TRUE(foo.b());
-  EXPECT_FALSE(foo.c());
+  EXPECT_EQ(1, foo.x);
+  EXPECT_EQ(2, foo.y);
+  EXPECT_FALSE(foo.a);
+  EXPECT_TRUE(foo.b);
+  EXPECT_FALSE(foo.c);
 
-  EXPECT_EQ(20, foo.bar().alpha());
-  EXPECT_EQ(40, foo.bar().beta());
-  EXPECT_EQ(60, foo.bar().gamma());
-  EXPECT_EQ(Bar::TYPE_VERTICAL, foo.bar().type());
+  EXPECT_EQ(20, foo.bar->alpha);
+  EXPECT_EQ(40, foo.bar->beta);
+  EXPECT_EQ(60, foo.bar->gamma);
+  EXPECT_EQ(Bar::TYPE_VERTICAL, foo.bar->type);
 
-  EXPECT_EQ(3u, foo.extra_bars().size());
-  for (size_t i = 0; i < foo.extra_bars().size(); i++) {
+  EXPECT_EQ(3u, foo.extra_bars.size());
+  for (size_t i = 0; i < foo.extra_bars.size(); i++) {
     uint8_t base = static_cast<uint8_t>(i * 100);
     Bar::Type type = i % 2 == 0 ? Bar::TYPE_VERTICAL : Bar::TYPE_HORIZONTAL;
-    EXPECT_EQ(base, foo.extra_bars()[i].alpha()) << i;
-    EXPECT_EQ(base + 20, foo.extra_bars()[i].beta()) << i;
-    EXPECT_EQ(base + 40, foo.extra_bars()[i].gamma()) << i;
-    EXPECT_EQ(type, foo.extra_bars()[i].type()) << i;
+    EXPECT_EQ(base, foo.extra_bars[i]->alpha) << i;
+    EXPECT_EQ(base + 20, foo.extra_bars[i]->beta) << i;
+    EXPECT_EQ(base + 40, foo.extra_bars[i]->gamma) << i;
+    EXPECT_EQ(type, foo.extra_bars[i]->type) << i;
   }
 
-  EXPECT_EQ(10u, foo.data().size());
-  for (size_t i = 0; i < foo.data().size(); ++i) {
-    EXPECT_EQ(static_cast<uint8_t>(foo.data().size() - i), foo.data()[i]) << i;
+  EXPECT_EQ(10u, foo.data.size());
+  for (size_t i = 0; i < foo.data.size(); ++i) {
+    EXPECT_EQ(static_cast<uint8_t>(foo.data.size() - i), foo.data[i]) << i;
   }
 
-  EXPECT_FALSE(foo.input_streams().is_null());
-  EXPECT_EQ(2u, foo.input_streams().size());
+  EXPECT_FALSE(foo.input_streams.is_null());
+  EXPECT_EQ(2u, foo.input_streams.size());
 
-  EXPECT_FALSE(foo.output_streams().is_null());
-  EXPECT_EQ(2u, foo.output_streams().size());
+  EXPECT_FALSE(foo.output_streams.is_null());
+  EXPECT_EQ(2u, foo.output_streams.size());
 
-  EXPECT_EQ(2u, foo.array_of_array_of_bools().size());
-  for (size_t i = 0; i < foo.array_of_array_of_bools().size(); ++i) {
-    EXPECT_EQ(2u, foo.array_of_array_of_bools()[i].size());
-    for (size_t j = 0; j < foo.array_of_array_of_bools()[i].size(); ++j) {
-      EXPECT_EQ(bool(j), foo.array_of_array_of_bools()[i][j]);
+  EXPECT_EQ(2u, foo.array_of_array_of_bools.size());
+  for (size_t i = 0; i < foo.array_of_array_of_bools.size(); ++i) {
+    EXPECT_EQ(2u, foo.array_of_array_of_bools[i].size());
+    for (size_t j = 0; j < foo.array_of_array_of_bools[i].size(); ++j) {
+      EXPECT_EQ(bool(j), foo.array_of_array_of_bools[i][j]);
     }
   }
 }
@@ -180,37 +175,32 @@ void Print(int depth, const char* name, uint8_t value) {
   std::cout << name << ": " << uint32_t(value) << std::endl;
 }
 
-void Print(int depth, const char* name, mojo::Handle value) {
+template <typename H>
+void Print(int depth, const char* name,
+           const mojo::ScopedHandleBase<H>& value) {
   PrintSpacer(depth);
-  std::cout << name << ": 0x" << std::hex << value.value() << std::endl;
+  std::cout << name << ": 0x" << std::hex << value.get().value() << std::endl;
 }
 
 void Print(int depth, const char* name, const mojo::String& str) {
-  std::string s = str.To<std::string>();
   PrintSpacer(depth);
-  std::cout << name << ": \"" << str.To<std::string>() << "\"" << std::endl;
+  std::cout << name << ": \"" << str.get() << "\"" << std::endl;
 }
 
-void Print(int depth, const char* name, const Bar& bar) {
+void Print(int depth, const char* name, const BarPtr& bar) {
   PrintSpacer(depth);
   std::cout << name << ":" << std::endl;
   if (!bar.is_null()) {
     ++depth;
-    Print(depth, "alpha", bar.alpha());
-    Print(depth, "beta", bar.beta());
-    Print(depth, "gamma", bar.gamma());
+    Print(depth, "alpha", bar->alpha);
+    Print(depth, "beta", bar->beta);
+    Print(depth, "gamma", bar->gamma);
     Print(depth, "packed", bar.To<int32_t>());
     --depth;
   }
 }
 
 template <typename T>
-void Print(int depth, const char* name,
-                  const mojo::Passable<T>& passable) {
-  Print(depth, name, passable.get());
-}
-
-template <typename T>
 void Print(int depth, const char* name, const mojo::Array<T>& array) {
   PrintSpacer(depth);
   std::cout << name << ":" << std::endl;
@@ -225,24 +215,24 @@ void Print(int depth, const char* name, const mojo::Array<T>& array) {
   }
 }
 
-void Print(int depth, const char* name, const Foo& foo) {
+void Print(int depth, const char* name, const FooPtr& foo) {
   PrintSpacer(depth);
   std::cout << name << ":" << std::endl;
   if (!foo.is_null()) {
     ++depth;
-    Print(depth, "name", foo.name());
-    Print(depth, "x", foo.x());
-    Print(depth, "y", foo.y());
-    Print(depth, "a", foo.a());
-    Print(depth, "b", foo.b());
-    Print(depth, "c", foo.c());
-    Print(depth, "bar", foo.bar());
-    Print(depth, "extra_bars", foo.extra_bars());
-    Print(depth, "data", foo.data());
-    Print(depth, "source", foo.source().get());
-    Print(depth, "input_streams", foo.input_streams());
-    Print(depth, "output_streams", foo.output_streams());
-    Print(depth, "array_of_array_of_bools", foo.array_of_array_of_bools());
+    Print(depth, "name", foo->name);
+    Print(depth, "x", foo->x);
+    Print(depth, "y", foo->y);
+    Print(depth, "a", foo->a);
+    Print(depth, "b", foo->b);
+    Print(depth, "c", foo->c);
+    Print(depth, "bar", foo->bar);
+    Print(depth, "extra_bars", foo->extra_bars);
+    Print(depth, "data", foo->data);
+    Print(depth, "source", foo->source);
+    Print(depth, "input_streams", foo->input_streams);
+    Print(depth, "output_streams", foo->output_streams);
+    Print(depth, "array_of_array_of_bools", foo->array_of_array_of_bools);
     --depth;
   }
 }
@@ -266,12 +256,14 @@ void DumpHex(const uint8_t* bytes, uint32_t num_bytes) {
 
 class ServiceImpl : public Service {
  public:
-  virtual void Frobinate(const Foo& foo, BazOptions baz, PortPtr port)
+  virtual void Frobinate(FooPtr foo, BazOptions baz, PortPtr port)
       MOJO_OVERRIDE {
     // Users code goes here to handle the incoming Frobinate message.
 
     // We mainly check that we're given the expected arguments.
-    CheckFoo(foo);
+    EXPECT_FALSE(foo.is_null());
+    if (!foo.is_null())
+      CheckFoo(*foo);
     EXPECT_EQ(BAZ_EXTRA, baz);
 
     if (g_dump_message_as_text) {
@@ -319,7 +311,6 @@ class SimpleMessageReceiver : public mojo::MessageReceiver {
 };
 
 TEST(BindingsSampleTest, Basic) {
-  mojo::Environment env;
   SimpleMessageReceiver receiver;
 
   // User has a proxy to a Service somehow.
@@ -331,46 +322,40 @@ TEST(BindingsSampleTest, Basic) {
   // allocated. Here, the various members of Foo are allocated before Foo is
   // allocated.
 
-  mojo::AllocationScope scope;
-
-  Foo foo = MakeFoo();
-  CheckFoo(foo);
+  FooPtr foo = MakeFoo();
+  CheckFoo(*foo);
 
   PortPtr port;
-  service->Frobinate(foo, Service::BAZ_EXTRA, port.Pass());
+  service->Frobinate(foo.Pass(), Service::BAZ_EXTRA, port.Pass());
 
   delete service;
 }
 
 TEST(BindingsSampleTest, DefaultValues) {
-  mojo::Environment env;
-  SimpleMessageReceiver receiver;
-  mojo::AllocationScope scope;
-
-  DefaultsTest full = DefaultsTest::Builder().Finish();
-  EXPECT_EQ(-12, full.a0());
-  EXPECT_EQ(12U, full.a1());
-  EXPECT_EQ(1234, full.a2());
-  EXPECT_EQ(34567U, full.a3());
-  EXPECT_EQ(123456, full.a4());
+  DefaultsTestPtr full(DefaultsTest::New());
+  EXPECT_EQ(-12, full->a0);
+  EXPECT_EQ(12U, full->a1);
+  EXPECT_EQ(1234, full->a2);
+  EXPECT_EQ(34567U, full->a3);
+  EXPECT_EQ(123456, full->a4);
   // TODO(vtl): crbug.com/375522
-  // EXPECT_EQ(3456789012U, full.a5());
-  EXPECT_EQ(111111111111LL, full.a6());
+  // EXPECT_EQ(3456789012U, full->a5);
+  EXPECT_EQ(111111111111LL, full->a6);
   // TODO(vtl): crbug.com/375522
-  // EXPECT_EQ(9999999999999999999ULL, full.a7());
-  EXPECT_EQ(0x12345, full.a8());
-  EXPECT_EQ(-0x12345, full.a9());
-  EXPECT_EQ(1234, full.a10());
-  EXPECT_TRUE(full.a11());
-  EXPECT_FALSE(full.a12());
-  EXPECT_FLOAT_EQ(123.25f, full.a13());
-  EXPECT_DOUBLE_EQ(1234567890.123, full.a14());
-  EXPECT_DOUBLE_EQ(1E10, full.a15());
-  EXPECT_DOUBLE_EQ(-1.2E+20, full.a16());
-  EXPECT_DOUBLE_EQ(1.23E-20, full.a17());
-  EXPECT_TRUE(full.a18().is_null());
-  EXPECT_TRUE(full.a19().is_null());
-  EXPECT_TRUE(full.a20().is_null());
+  // EXPECT_EQ(9999999999999999999ULL, full->a7);
+  EXPECT_EQ(0x12345, full->a8);
+  EXPECT_EQ(-0x12345, full->a9);
+  EXPECT_EQ(1234, full->a10);
+  EXPECT_TRUE(full->a11);
+  EXPECT_FALSE(full->a12);
+  EXPECT_FLOAT_EQ(123.25f, full->a13);
+  EXPECT_DOUBLE_EQ(1234567890.123, full->a14);
+  EXPECT_DOUBLE_EQ(1E10, full->a15);
+  EXPECT_DOUBLE_EQ(-1.2E+20, full->a16);
+  EXPECT_DOUBLE_EQ(1.23E-20, full->a17);
+  EXPECT_TRUE(full->a18.is_null());
+  EXPECT_TRUE(full->a19.is_null());
+  EXPECT_TRUE(full->a20.is_null());
 }
 
 }  // namespace