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

sky/viewer/internals.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SKY_VIEWER_INTERNALS_H_
 #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 "sky/services/testing/test_harness.mojom.h"
 
 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*);
 
   virtual ~Internals();
 
   virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
       v8::Isolate* isolate) override;
 
  private:
   explicit Internals(DocumentView* document_view);
 
+  mojo::Handle ShellProxyHandle();
   std::string RenderTreeAsText();
   std::string ContentAsText();
   void NotifyTestComplete(const std::string& test_result);
 
   mojo::Handle ConnectToService(
       const std::string& application_url, const std::string& interface_name);
 
   void pauseAnimations(double pauseTime);
 
   base::WeakPtr<DocumentView> document_view_;
+  std::vector<JSShellProxy*> js_shell_proxies_;
   TestHarnessPtr test_harness_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Internals);
 };
 
 }  // namespace sky
 
 #endif  // SKY_VIEWER_INTERNALS_H_