Gin: Make it easier to implement Wrappable.

BUG=

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

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

2 files changed, 6 insertions, 11 deletions

diff --git a/mojo/apps/js/bindings/waiting_callback.cc b/mojo/apps/js/bindings/waiting_callback.cc
index a1d230c..48166d1 100644
--- a/mojo/apps/js/bindings/waiting_callback.cc
+++ b/mojo/apps/js/bindings/waiting_callback.cc
@@ -7,6 +7,8 @@
 #include "gin/per_context_data.h"
 #include "gin/per_isolate_data.h"
 
+INIT_WRAPPABLE(mojo::js::WaitingCallback);
+
 namespace mojo {
 namespace js {
 
@@ -35,19 +37,14 @@ gin::Handle<WaitingCallback> WaitingCallback::Create(
   return gin::CreateHandle(isolate, new WaitingCallback(isolate, callback));
 }
 
-gin::WrapperInfo WaitingCallback::kWrapperInfo = { gin::kEmbedderNativeGin };
-
-gin::WrapperInfo* WaitingCallback::GetWrapperInfo() {
-  return &kWrapperInfo;
-}
-
 void WaitingCallback::EnsureRegistered(v8::Isolate* isolate) {
   gin::PerIsolateData* data = gin::PerIsolateData::From(isolate);
-  if (!data->GetObjectTemplate(&kWrapperInfo).IsEmpty())
+  if (!data->GetObjectTemplate(&WaitingCallback::kWrapperInfo).IsEmpty()) {
     return;
+  }
   v8::Handle<v8::ObjectTemplate> templ = v8::ObjectTemplate::New(isolate);
   templ->SetInternalFieldCount(gin::kNumberOfInternalFields);
-  data->SetObjectTemplate(&kWrapperInfo, templ);
+  data->SetObjectTemplate(&WaitingCallback::kWrapperInfo, templ);
 }
 
 void WaitingCallback::OnHandleReady(MojoResult result) {
diff --git a/mojo/apps/js/bindings/waiting_callback.h b/mojo/apps/js/bindings/waiting_callback.h
index e8721e3..8bc7628 100644
--- a/mojo/apps/js/bindings/waiting_callback.h
+++ b/mojo/apps/js/bindings/waiting_callback.h
@@ -13,14 +13,12 @@
 namespace mojo {
 namespace js {
 
-class WaitingCallback : public gin::Wrappable,
+class WaitingCallback : public gin::Wrappable<WaitingCallback>,
                         public BindingsSupport::AsyncWaitCallback {
  public:
   static gin::Handle<WaitingCallback> Create(
       v8::Isolate* isolate, v8::Handle<v8::Function> callback);
 
-  static gin::WrapperInfo kWrapperInfo;
-  virtual gin::WrapperInfo* GetWrapperInfo() OVERRIDE;
   static void EnsureRegistered(v8::Isolate* isolate);
 
   BindingsSupport::AsyncWaitID wait_id() const {