Revert 231131 "No more d_. Use initial capital letter to denote ..."

> No more d_. Use initial capital letter to denote private fields.
> 
> R=davemoore@chromium.org
> 
> Review URL: https://codereview.chromium.org/45123003

TBR=darin@chromium.org

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

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

3 files changed, 85 insertions, 78 deletions

diff --git a/mojo/public/bindings/lib/TODO b/mojo/public/bindings/lib/TODO
index e81cc11..7f3dc13 100644
--- a/mojo/public/bindings/lib/TODO
+++ b/mojo/public/bindings/lib/TODO
@@ -7,3 +7,4 @@ TODOs:
  - Add compile-time asserts to verify object packing and padding.
  - Pack boolean arrays?
  - Investigate making arrays of objects not be arrays of pointers.
+ - Consider getting rid of Data structs (i.e., d_ member).
diff --git a/mojo/public/bindings/sample/generated/sample_service.h b/mojo/public/bindings/sample/generated/sample_service.h
index c102384..bdc0831 100644
--- a/mojo/public/bindings/sample/generated/sample_service.h
+++ b/mojo/public/bindings/sample/generated/sample_service.h
@@ -17,28 +17,30 @@ class Bar {
     return new (buf->Allocate(sizeof(Bar))) Bar();
   }
 
-  void set_alpha(uint8_t alpha) { alpha_ = alpha; }
-  void set_beta(uint8_t beta) { beta_ = beta; }
-  void set_gamma(uint8_t gamma) { gamma_ = gamma; }
+  void set_alpha(uint8_t alpha) { d_.alpha = alpha; }
+  void set_beta(uint8_t beta) { d_.beta = beta; }
+  void set_gamma(uint8_t gamma) { d_.gamma = gamma; }
 
-  uint8_t alpha() const { return alpha_; }
-  uint8_t beta() const { return beta_; }
-  uint8_t gamma() const { return gamma_; }
+  uint8_t alpha() const { return d_.alpha; }
+  uint8_t beta() const { return d_.beta; }
+  uint8_t gamma() const { return d_.gamma; }
 
  private:
   friend class mojo::internal::ObjectTraits<Bar>;
 
   Bar() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 3;
+    header_.num_bytes = sizeof(*this);
+    header_.num_fields = 3;
   }
   ~Bar();  // NOT IMPLEMENTED
 
-  mojo::internal::StructHeader _header_;
-  uint8_t alpha_;
-  uint8_t beta_;
-  uint8_t gamma_;
-  uint8_t _pad0_[5];
+  mojo::internal::StructHeader header_;
+  struct Data {
+    uint8_t alpha;
+    uint8_t beta;
+    uint8_t gamma;
+    uint8_t padding0_[5];
+  } d_;
 };
 MOJO_COMPILE_ASSERT(sizeof(Bar) == 16, bad_sizeof_Bar);
 
@@ -48,64 +50,66 @@ class Foo {
     return new (buf->Allocate(sizeof(Foo))) Foo();
   }
 
-  void set_x(int32_t x) { x_ = x; }
-  void set_y(int32_t y) { y_ = y; }
-  void set_a(bool a) { a_ = a; }
-  void set_b(bool b) { b_ = b; }
-  void set_c(bool c) { c_ = c; }
-  void set_bar(Bar* bar) { bar_.ptr = bar; }
-  void set_data(mojo::Array<uint8_t>* data) { data_.ptr = data; }
+  void set_x(int32_t x) { d_.x = x; }
+  void set_y(int32_t y) { d_.y = y; }
+  void set_a(bool a) { d_.a = a; }
+  void set_b(bool b) { d_.b = b; }
+  void set_c(bool c) { d_.c = c; }
+  void set_bar(Bar* bar) { d_.bar.ptr = bar; }
+  void set_data(mojo::Array<uint8_t>* data) { d_.data.ptr = data; }
   void set_extra_bars(mojo::Array<Bar*>* extra_bars) {
-    extra_bars_.ptr = extra_bars;
+    d_.extra_bars.ptr = extra_bars;
   }
   void set_name(mojo::String* name) {
-    name_.ptr = name;
+    d_.name.ptr = name;
   }
   void set_files(mojo::Array<mojo::Handle>* files) {
-    files_.ptr = files;
+    d_.files.ptr = files;
   }
 
-  int32_t x() const { return x_; }
-  int32_t y() const { return y_; }
-  bool a() const { return a_; }
-  bool b() const { return b_; }
-  bool c() const { return c_; }
-  const Bar* bar() const { return bar_.ptr; }
-  const mojo::Array<uint8_t>* data() const { return data_.ptr; }
+  int32_t x() const { return d_.x; }
+  int32_t y() const { return d_.y; }
+  bool a() const { return d_.a; }
+  bool b() const { return d_.b; }
+  bool c() const { return d_.c; }
+  const Bar* bar() const { return d_.bar.ptr; }
+  const mojo::Array<uint8_t>* data() const { return d_.data.ptr; }
   const mojo::Array<Bar*>* extra_bars() const {
     // NOTE: extra_bars is an optional field!
-    return _header_.num_fields >= 8 ? extra_bars_.ptr : NULL;
+    return header_.num_fields >= 8 ? d_.extra_bars.ptr : NULL;
   }
   const mojo::String* name() const {
     // NOTE: name is also an optional field!
-    return _header_.num_fields >= 9 ? name_.ptr : NULL;
+    return header_.num_fields >= 9 ? d_.name.ptr : NULL;
   }
   const mojo::Array<mojo::Handle>* files() const {
     // NOTE: files is also an optional field!
-    return _header_.num_fields >= 10 ? files_.ptr : NULL;
+    return header_.num_fields >= 10 ? d_.files.ptr : NULL;
   }
 
  private:
   friend class mojo::internal::ObjectTraits<Foo>;
 
   Foo() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 10;
+    header_.num_bytes = sizeof(*this);
+    header_.num_fields = 10;
   }
   ~Foo();  // NOT IMPLEMENTED
 
-  mojo::internal::StructHeader _header_;
-  int32_t x_;
-  int32_t y_;
-  uint8_t a_ : 1;
-  uint8_t b_ : 1;
-  uint8_t c_ : 1;
-  uint8_t _pad0_[7];
-  mojo::internal::StructPointer<Bar> bar_;
-  mojo::internal::ArrayPointer<uint8_t> data_;
-  mojo::internal::ArrayPointer<Bar*> extra_bars_;
-  mojo::internal::StringPointer name_;
-  mojo::internal::ArrayPointer<mojo::Handle> files_;
+  mojo::internal::StructHeader header_;
+  struct Data {
+    int32_t x;
+    int32_t y;
+    uint8_t a : 1;
+    uint8_t b : 1;
+    uint8_t c : 1;
+    uint8_t padding0_[7];
+    mojo::internal::StructPointer<Bar> bar;
+    mojo::internal::ArrayPointer<uint8_t> data;
+    mojo::internal::ArrayPointer<Bar*> extra_bars;
+    mojo::internal::StringPointer name;
+    mojo::internal::ArrayPointer<mojo::Handle> files;
+  } d_;
 };
 MOJO_COMPILE_ASSERT(sizeof(Foo) == 64, bad_sizeof_Foo);
 
diff --git a/mojo/public/bindings/sample/generated/sample_service_serialization.h b/mojo/public/bindings/sample/generated/sample_service_serialization.h
index ef46860..4ff9b63 100644
--- a/mojo/public/bindings/sample/generated/sample_service_serialization.h
+++ b/mojo/public/bindings/sample/generated/sample_service_serialization.h
@@ -24,31 +24,33 @@ class Service_Frobinate_Params {
         Service_Frobinate_Params();
   }
 
-  void set_foo(Foo* foo) { foo_.ptr = foo; }
-  void set_baz(bool baz) { baz_ = baz; }
-  void set_port(mojo::Handle port) { port_ = port; }
+  void set_foo(Foo* foo) { d_.foo.ptr = foo; }
+  void set_baz(bool baz) { d_.baz = baz; }
+  void set_port(mojo::Handle port) { d_.port = port; }
 
-  const Foo* foo() const { return foo_.ptr; }
-  bool baz() const { return baz_; }
+  const Foo* foo() const { return d_.foo.ptr; }
+  bool baz() const { return d_.baz; }
   mojo::Handle port() const {
     // NOTE: port is an optional field!
-    return _header_.num_fields >= 3 ? port_ : mojo::kInvalidHandle;
+    return header_.num_fields >= 3 ? d_.port : mojo::kInvalidHandle;
   }
 
  private:
   friend class mojo::internal::ObjectTraits<Service_Frobinate_Params>;
 
   Service_Frobinate_Params() {
-    _header_.num_bytes = sizeof(*this);
-    _header_.num_fields = 3;
+    header_.num_bytes = sizeof(*this);
+    header_.num_fields = 3;
   }
   ~Service_Frobinate_Params();  // NOT IMPLEMENTED
 
-  mojo::internal::StructHeader _header_;
-  mojo::internal::StructPointer<Foo> foo_;
-  uint8_t baz_ : 1;
-  uint8_t _pad0_[3];
-  mojo::Handle port_;
+  mojo::internal::StructHeader header_;
+  struct Data {
+    mojo::internal::StructPointer<Foo> foo;
+    uint8_t baz : 1;
+    uint8_t padding0_[3];
+    mojo::Handle port;
+  } d_;
 };
 MOJO_COMPILE_ASSERT(sizeof(Service_Frobinate_Params) == 24,
                     bad_sizeof_Service_Frobinate_Params);
@@ -111,29 +113,29 @@ class ObjectTraits<sample::Foo> {
 
   static void EncodePointersAndHandles(sample::Foo* foo,
                                        std::vector<mojo::Handle>* handles) {
-    Encode(&foo->bar_, handles);
-    Encode(&foo->data_, handles);
-    Encode(&foo->extra_bars_, handles);
-    Encode(&foo->name_, handles);
-    Encode(&foo->files_, handles);
+    Encode(&foo->d_.bar, handles);
+    Encode(&foo->d_.data, handles);
+    Encode(&foo->d_.extra_bars, handles);
+    Encode(&foo->d_.name, handles);
+    Encode(&foo->d_.files, handles);
   }
 
   static bool DecodePointersAndHandles(sample::Foo* foo,
                                        const mojo::Message& message) {
-    if (!Decode(&foo->bar_, message))
+    if (!Decode(&foo->d_.bar, message))
       return false;
-    if (!Decode(&foo->data_, message))
+    if (!Decode(&foo->d_.data, message))
       return false;
-    if (foo->_header_.num_fields >= 8) {
-      if (!Decode(&foo->extra_bars_, message))
+    if (foo->header_.num_fields >= 8) {
+      if (!Decode(&foo->d_.extra_bars, message))
         return false;
     }
-    if (foo->_header_.num_fields >= 9) {
-      if (!Decode(&foo->name_, message))
+    if (foo->header_.num_fields >= 9) {
+      if (!Decode(&foo->d_.name, message))
         return false;
     }
-    if (foo->_header_.num_fields >= 10) {
-      if (!Decode(&foo->files_, message))
+    if (foo->header_.num_fields >= 10) {
+      if (!Decode(&foo->d_.files, message))
         return false;
     }
 
@@ -148,17 +150,17 @@ class ObjectTraits<sample::internal::Service_Frobinate_Params> {
   static void EncodePointersAndHandles(
       sample::internal::Service_Frobinate_Params* params,
       std::vector<mojo::Handle>* handles) {
-    Encode(&params->foo_, handles);
-    EncodeHandle(&params->port_, handles);
+    Encode(&params->d_.foo, handles);
+    EncodeHandle(&params->d_.port, handles);
   }
 
   static bool DecodePointersAndHandles(
       sample::internal::Service_Frobinate_Params* params,
       const mojo::Message& message) {
-    if (!Decode(&params->foo_, message))
+    if (!Decode(&params->d_.foo, message))
       return false;
-    if (params->_header_.num_fields >= 3) {
-      if (!DecodeHandle(&params->port_, message.handles))
+    if (params->header_.num_fields >= 3) {
+      if (!DecodeHandle(&params->d_.port, message.handles))
         return false;
     }