Mojo: Generate bindings from math_calculator.mojom.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235806 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 3 insertions, 471 deletions

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index c145ea5..f4d41de 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -126,11 +126,10 @@
       'sources': [
         'public/tests/bindings_connector_unittest.cc',
         'public/tests/bindings_remote_ptr_unittest.cc',
-        'public/tests/mojom/math_calculator.cc',
-        'public/tests/mojom/math_calculator.h',
-        'public/tests/mojom/math_calculator_internal.h',
+        'public/tests/math_calculator.mojom',
         'public/tests/system_core_unittest.cc',
       ],
+      'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
     },
     {
       'target_name': 'mojo_public_perftests',
diff --git a/mojo/public/tests/bindings_remote_ptr_unittest.cc b/mojo/public/tests/bindings_remote_ptr_unittest.cc
index ff0548e..ea4cb3e 100644
--- a/mojo/public/tests/bindings_remote_ptr_unittest.cc
+++ b/mojo/public/tests/bindings_remote_ptr_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mojo/public/bindings/lib/remote_ptr.h"
-#include "mojo/public/tests/mojom/math_calculator.h"
 #include "mojo/public/tests/simple_bindings_support.h"
+#include "mojom/math_calculator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
diff --git a/mojo/public/tests/mojom/DEPS b/mojo/public/tests/mojom/DEPS
deleted file mode 100644
index c2cf2d4..0000000
--- a/mojo/public/tests/mojom/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+.",
-]
diff --git a/mojo/public/tests/mojom/math_calculator.cc b/mojo/public/tests/mojom/math_calculator.cc
deleted file mode 100644
index c989b38..0000000
--- a/mojo/public/tests/mojom/math_calculator.cc
+++ /dev/null
@@ -1,366 +0,0 @@
-// 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.
-
-#include "./math_calculator.h"
-
-#include "mojo/public/bindings/lib/message_builder.h"
-#include "./math_calculator_internal.h"
-
-namespace math {
-namespace {
-
-#pragma pack(push, 1)
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
-const uint32_t kCalculator_Clear_Name = 0;
-class Calculator_Clear_Params {
- public:
-  static Calculator_Clear_Params* New(mojo::Buffer* buf) {
-    return new (buf->Allocate(sizeof(Calculator_Clear_Params)))
-        Calculator_Clear_Params();
-  }
-
-
-
-
-
- private:
-  friend class mojo::internal::ObjectTraits<Calculator_Clear_Params>;
-
-  Calculator_Clear_Params() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 3;
-  }
-
-  mojo::internal::StructHeader _header_;
-
-};
-MOJO_COMPILE_ASSERT(sizeof(Calculator_Clear_Params) == 8,
-                    bad_sizeof_Calculator_Clear_Params);
-
-const uint32_t kCalculator_Add_Name = 1;
-class Calculator_Add_Params {
- public:
-  static Calculator_Add_Params* New(mojo::Buffer* buf) {
-    return new (buf->Allocate(sizeof(Calculator_Add_Params)))
-        Calculator_Add_Params();
-  }
-
-  void set_value(double value) { value_ = value; }
-
-  double value() const { return value_; }
-
- private:
-  friend class mojo::internal::ObjectTraits<Calculator_Add_Params>;
-
-  Calculator_Add_Params() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 3;
-  }
-
-  mojo::internal::StructHeader _header_;
-  double value_;
-};
-MOJO_COMPILE_ASSERT(sizeof(Calculator_Add_Params) == 16,
-                    bad_sizeof_Calculator_Add_Params);
-
-const uint32_t kCalculator_Multiply_Name = 2;
-class Calculator_Multiply_Params {
- public:
-  static Calculator_Multiply_Params* New(mojo::Buffer* buf) {
-    return new (buf->Allocate(sizeof(Calculator_Multiply_Params)))
-        Calculator_Multiply_Params();
-  }
-
-  void set_value(double value) { value_ = value; }
-
-  double value() const { return value_; }
-
- private:
-  friend class mojo::internal::ObjectTraits<Calculator_Multiply_Params>;
-
-  Calculator_Multiply_Params() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 3;
-  }
-
-  mojo::internal::StructHeader _header_;
-  double value_;
-};
-MOJO_COMPILE_ASSERT(sizeof(Calculator_Multiply_Params) == 16,
-                    bad_sizeof_Calculator_Multiply_Params);
-
-const uint32_t kCalculatorUI_Output_Name = 0;
-class CalculatorUI_Output_Params {
- public:
-  static CalculatorUI_Output_Params* New(mojo::Buffer* buf) {
-    return new (buf->Allocate(sizeof(CalculatorUI_Output_Params)))
-        CalculatorUI_Output_Params();
-  }
-
-  void set_value(double value) { value_ = value; }
-
-  double value() const { return value_; }
-
- private:
-  friend class mojo::internal::ObjectTraits<CalculatorUI_Output_Params>;
-
-  CalculatorUI_Output_Params() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 3;
-  }
-
-  mojo::internal::StructHeader _header_;
-  double value_;
-};
-MOJO_COMPILE_ASSERT(sizeof(CalculatorUI_Output_Params) == 16,
-                    bad_sizeof_CalculatorUI_Output_Params);
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-#pragma pack(pop)
-
-}  // namespace
-
-
-
-CalculatorProxy::CalculatorProxy(mojo::MessageReceiver* receiver)
-    : receiver_(receiver) {
-}
-
-void CalculatorProxy::Clear() {
-  size_t payload_size =
-      mojo::internal::Align(sizeof(Calculator_Clear_Params));
-
-
-  mojo::MessageBuilder builder(kCalculator_Clear_Name, payload_size);
-
-  Calculator_Clear_Params* params =
-      Calculator_Clear_Params::New(builder.buffer());
-
-
-
-  mojo::Message message;
-  mojo::internal::EncodePointersAndHandles(params, &message.handles);
-
-  message.data = builder.Finish();
-
-  receiver_->Accept(&message);
-}
-
-
-void CalculatorProxy::Add(double value) {
-  size_t payload_size =
-      mojo::internal::Align(sizeof(Calculator_Add_Params));
-
-
-  mojo::MessageBuilder builder(kCalculator_Add_Name, payload_size);
-
-  Calculator_Add_Params* params =
-      Calculator_Add_Params::New(builder.buffer());
-
-  params->set_value(value);
-
-  mojo::Message message;
-  mojo::internal::EncodePointersAndHandles(params, &message.handles);
-
-  message.data = builder.Finish();
-
-  receiver_->Accept(&message);
-}
-
-
-void CalculatorProxy::Multiply(double value) {
-  size_t payload_size =
-      mojo::internal::Align(sizeof(Calculator_Multiply_Params));
-
-
-  mojo::MessageBuilder builder(kCalculator_Multiply_Name, payload_size);
-
-  Calculator_Multiply_Params* params =
-      Calculator_Multiply_Params::New(builder.buffer());
-
-  params->set_value(value);
-
-  mojo::Message message;
-  mojo::internal::EncodePointersAndHandles(params, &message.handles);
-
-  message.data = builder.Finish();
-
-  receiver_->Accept(&message);
-}
-
-
-bool CalculatorStub::Accept(mojo::Message* message) {
-  switch (message->data->header.name) {
-    case kCalculator_Clear_Name: {
-      Calculator_Clear_Params* params =
-          reinterpret_cast<Calculator_Clear_Params*>(
-              message->data->payload);
-
-      if (!mojo::internal::DecodePointersAndHandles(params, *message))
-        return false;
-      Clear();
-      break;
-    }
-
-    case kCalculator_Add_Name: {
-      Calculator_Add_Params* params =
-          reinterpret_cast<Calculator_Add_Params*>(
-              message->data->payload);
-
-      if (!mojo::internal::DecodePointersAndHandles(params, *message))
-        return false;
-      Add(params->value());
-      break;
-    }
-
-    case kCalculator_Multiply_Name: {
-      Calculator_Multiply_Params* params =
-          reinterpret_cast<Calculator_Multiply_Params*>(
-              message->data->payload);
-
-      if (!mojo::internal::DecodePointersAndHandles(params, *message))
-        return false;
-      Multiply(params->value());
-      break;
-    }
-
-  }
-  return true;
-}
-
-
-CalculatorUIProxy::CalculatorUIProxy(mojo::MessageReceiver* receiver)
-    : receiver_(receiver) {
-}
-
-void CalculatorUIProxy::Output(double value) {
-  size_t payload_size =
-      mojo::internal::Align(sizeof(CalculatorUI_Output_Params));
-
-
-  mojo::MessageBuilder builder(kCalculatorUI_Output_Name, payload_size);
-
-  CalculatorUI_Output_Params* params =
-      CalculatorUI_Output_Params::New(builder.buffer());
-
-  params->set_value(value);
-
-  mojo::Message message;
-  mojo::internal::EncodePointersAndHandles(params, &message.handles);
-
-  message.data = builder.Finish();
-
-  receiver_->Accept(&message);
-}
-
-
-bool CalculatorUIStub::Accept(mojo::Message* message) {
-  switch (message->data->header.name) {
-    case kCalculatorUI_Output_Name: {
-      CalculatorUI_Output_Params* params =
-          reinterpret_cast<CalculatorUI_Output_Params*>(
-              message->data->payload);
-
-      if (!mojo::internal::DecodePointersAndHandles(params, *message))
-        return false;
-      Output(params->value());
-      break;
-    }
-
-  }
-  return true;
-}
-
-
-}  // namespace math
-
-namespace mojo {
-namespace internal {
-
-
-
-template <>
-class ObjectTraits<math::Calculator_Clear_Params> {
- public:
-  static void EncodePointersAndHandles(
-      math::Calculator_Clear_Params* params,
-      std::vector<Handle>* handles) {
-
-
-  }
-
-  static bool DecodePointersAndHandles(
-      math::Calculator_Clear_Params* params,
-      const Message& message) {
-
-
-    return true;
-  }
-};
-
-template <>
-class ObjectTraits<math::Calculator_Add_Params> {
- public:
-  static void EncodePointersAndHandles(
-      math::Calculator_Add_Params* params,
-      std::vector<Handle>* handles) {
-
-
-  }
-
-  static bool DecodePointersAndHandles(
-      math::Calculator_Add_Params* params,
-      const Message& message) {
-
-
-    return true;
-  }
-};
-
-template <>
-class ObjectTraits<math::Calculator_Multiply_Params> {
- public:
-  static void EncodePointersAndHandles(
-      math::Calculator_Multiply_Params* params,
-      std::vector<Handle>* handles) {
-
-
-  }
-
-  static bool DecodePointersAndHandles(
-      math::Calculator_Multiply_Params* params,
-      const Message& message) {
-
-
-    return true;
-  }
-};
-
-template <>
-class ObjectTraits<math::CalculatorUI_Output_Params> {
- public:
-  static void EncodePointersAndHandles(
-      math::CalculatorUI_Output_Params* params,
-      std::vector<Handle>* handles) {
-
-
-  }
-
-  static bool DecodePointersAndHandles(
-      math::CalculatorUI_Output_Params* params,
-      const Message& message) {
-
-
-    return true;
-  }
-};
-
-
-}  // namespace internal
-}  // namespace mojo
diff --git a/mojo/public/tests/mojom/math_calculator.h b/mojo/public/tests/mojom/math_calculator.h
deleted file mode 100644
index 3e2713d..0000000
--- a/mojo/public/tests/mojom/math_calculator.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// 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.
-
-#ifndef MOJO_GENERATED_BINDINGS_MATH_CALCULATOR_MATH_CALCULATOR_H_
-#define MOJO_GENERATED_BINDINGS_MATH_CALCULATOR_MATH_CALCULATOR_H_
-
-#include "mojo/public/bindings/lib/bindings.h"
-#include "mojo/public/bindings/lib/message.h"
-
-namespace math {
-
-#pragma pack(push, 1)
-
-
-#pragma pack(pop)
-
-class CalculatorProxy;
-class CalculatorStub;
-class CalculatorUI;
-
-class Calculator {
- public:
-  typedef CalculatorProxy _Proxy;
-  typedef CalculatorStub _Stub;
-  typedef CalculatorUI _Peer;
-  virtual void Clear()  = 0;
-  virtual void Add(double value)  = 0;
-  virtual void Multiply(double value)  = 0;
-};
-
-class CalculatorUIProxy;
-class CalculatorUIStub;
-class Calculator;
-
-class CalculatorUI {
- public:
-  typedef CalculatorUIProxy _Proxy;
-  typedef CalculatorUIStub _Stub;
-  typedef Calculator _Peer;
-  virtual void Output(double value)  = 0;
-};
-
-class CalculatorProxy : public Calculator {
- public:
-  explicit CalculatorProxy(mojo::MessageReceiver* receiver);
-
-  virtual void Clear() MOJO_OVERRIDE;
-  virtual void Add(double value) MOJO_OVERRIDE;
-  virtual void Multiply(double value) MOJO_OVERRIDE;
-
- private:
-  mojo::MessageReceiver* receiver_;
-};
-
-class CalculatorUIProxy : public CalculatorUI {
- public:
-  explicit CalculatorUIProxy(mojo::MessageReceiver* receiver);
-
-  virtual void Output(double value) MOJO_OVERRIDE;
-
- private:
-  mojo::MessageReceiver* receiver_;
-};
-
-class CalculatorStub : public Calculator, public mojo::MessageReceiver {
- public:
-  virtual bool Accept(mojo::Message* message) MOJO_OVERRIDE;
-};
-
-class CalculatorUIStub : public CalculatorUI, public mojo::MessageReceiver {
- public:
-  virtual bool Accept(mojo::Message* message) MOJO_OVERRIDE;
-};
-
-
-}  // namespace math
-
-#endif  // MOJO_GENERATED_BINDINGS_MATH_CALCULATOR_MATH_CALCULATOR_H_
diff --git a/mojo/public/tests/mojom/math_calculator_internal.h b/mojo/public/tests/mojom/math_calculator_internal.h
deleted file mode 100644
index 3c56bd8..0000000
--- a/mojo/public/tests/mojom/math_calculator_internal.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.
-
-#ifndef MOJO_GENERATED_BINDINGS_MATH_CALCULATOR_MATH_CALCULATOR_INTERNAL_H_
-#define MOJO_GENERATED_BINDINGS_MATH_CALCULATOR_MATH_CALCULATOR_INTERNAL_H_
-
-#include "mojo/public/bindings/lib/bindings_serialization.h"
-#include "./math_calculator.h"
-
-namespace mojo {
-namespace internal {
-
-
-
-}  // namespace internal
-}  // namespace mojo
-
-#endif  // MOJO_GENERATED_BINDINGS_MATH_CALCULATOR_MATH_CALCULATOR_INTERNAL_H_