Gin: Make it easier to implement Wrappable

gin/function_template.cc

Index: gin/function_template.cc
diff --git a/gin/function_template.cc b/gin/function_template.cc
index 07882e8796e8ac3c9aab37d91677aa44300fd3f6..5a834a3c5168eb4a568921e920ac0c80eb86ba01 100644
--- a/gin/function_template.cc
+++ b/gin/function_template.cc
@@ -8,23 +8,18 @@
 
 namespace gin {
 
-WrapperInfo internal::CallbackHolderBase::kWrapperInfo = { kEmbedderNativeGin };
-
-WrapperInfo* internal::CallbackHolderBase::GetWrapperInfo() {
-  return &kWrapperInfo;
-}
-
 void InitFunctionTemplates(PerIsolateData* isolate_data) {
   if (!isolate_data->GetObjectTemplate(
-          &internal::CallbackHolderBase::kWrapperInfo).IsEmpty()) {
+          &WrappableTraits<internal::CallbackHolderBase>::
+          kWrapperInfo).IsEmpty()) {
     return;
   }
 
   v8::Handle<v8::ObjectTemplate> templ(
       v8::ObjectTemplate::New(isolate_data->isolate()));
   templ->SetInternalFieldCount(kNumberOfInternalFields);
-  isolate_data->SetObjectTemplate(&internal::CallbackHolderBase::kWrapperInfo,
-                                  templ);
+  isolate_data->SetObjectTemplate(
+      &WrappableTraits<internal::CallbackHolderBase>::kWrapperInfo, templ);
 }
 
 }  // namespace gin