Mojo JS Bindings: merge Application, Shell, ServiceProvider with Sky

sky/viewer/internals.h

Index: sky/viewer/internals.h
diff --git a/sky/viewer/internals.h b/sky/viewer/internals.h
index 22ca4c3cb5432345c6c46a6d282b891b7a793e9f..93c0ed8a12d45599ae1ee7e1637d1edf90e2beeb 100644
--- a/sky/viewer/internals.h
+++ b/sky/viewer/internals.h
@@ -13,8 +13,10 @@
 
 namespace sky {
 class DocumentView;
+class JSShellProxy;
 
 class Internals : public gin::Wrappable<Internals> {
+  friend class JSShellProxy;

[abarth-chromium, 2015/01/07 22:52:01]

Why friend?

[hansmuller1, 2015/01/07 23:33:04]

I'm referring to the document_view_ weak pointer field from JSProxyShell. I
could put JSProxyShell inside this class definition to avoid the friend
declaration. Better?

  public:
   static gin::WrapperInfo kWrapperInfo;
   static gin::Handle<Internals> Create(v8::Isolate*, DocumentView*);
@@ -27,6 +29,7 @@ class Internals : public gin::Wrappable<Internals> {
  private:
   explicit Internals(DocumentView* document_view);
 
+  mojo::Handle ShellProxyHandle();
   std::string RenderTreeAsText();
   std::string ContentAsText();
   void NotifyTestComplete(const std::string& test_result);
@@ -37,6 +40,7 @@ class Internals : public gin::Wrappable<Internals> {
   void pauseAnimations(double pauseTime);
 
   base::WeakPtr<DocumentView> document_view_;
+  std::vector<JSShellProxy*> js_shell_proxies_;
   TestHarnessPtr test_harness_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Internals);