Merge the Sky Engine changes from the SkyDart branch

sky/viewer/internals.h

Index: sky/viewer/internals.h
diff --git a/sky/viewer/internals.h b/sky/viewer/internals.h
index e546b922dd646966ca0f99572f4aba3519c07283..87136e830ffb32350a2f72918e9ece98325ad783 100644
--- a/sky/viewer/internals.h
+++ b/sky/viewer/internals.h
@@ -6,28 +6,20 @@
 #define SKY_VIEWER_INTERNALS_H_
 
 #include "base/memory/weak_ptr.h"
-#include "gin/handle.h"
-#include "gin/object_template_builder.h"
-#include "gin/wrappable.h"
+#include "base/supports_user_data.h"
+#include "dart/runtime/include/dart_api.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "sky/services/testing/test_harness.mojom.h"
 
 namespace sky {
 class DocumentView;
 
-class Internals : public gin::Wrappable<Internals>,
+class Internals : public base::SupportsUserData::Data,
                   public mojo::Shell {
  public:
-  static gin::WrapperInfo kWrapperInfo;
-  static gin::Handle<Internals> Create(v8::Isolate*, DocumentView*);
-
   virtual ~Internals();
 
-  virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) override;
-
- private:
-  explicit Internals(DocumentView* document_view);
+  static void Create(Dart_Isolate isolate, DocumentView* document_view);
 
   // mojo::Shell method:
   void ConnectToApplication(
@@ -47,6 +39,9 @@ class Internals : public gin::Wrappable<Internals>,
 
   void pauseAnimations(double pauseTime);
 
+ private:
+  explicit Internals(DocumentView* document_view);
+
   base::WeakPtr<DocumentView> document_view_;
   mojo::Binding<mojo::Shell> shell_binding_;
   TestHarnessPtr test_harness_;