Adds support for headless chrome embedder mojo services

headless/lib/browser/headless_web_contents_impl.h

 // Copyright 2015 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 HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
 #define HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
 
+#include "content/public/browser/web_contents_observer.h"
 #include "headless/public/headless_devtools_target.h"
 #include "headless/public/headless_web_contents.h"
 
 #include <memory>
 #include <unordered_map>
 
 namespace aura {
 class Window;
 }
 
 namespace content {
 class BrowserContext;
 class DevToolsAgentHost;
 class WebContents;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace headless {
 class HeadlessDevToolsHostImpl;
 class HeadlessBrowserImpl;
 class WebContentsObserverAdapter;
 
 class HeadlessWebContentsImpl : public HeadlessWebContents,
-                                public HeadlessDevToolsTarget {
+                                public HeadlessDevToolsTarget,
+                                public content::WebContentsObserver {
  public:
   ~HeadlessWebContentsImpl() override;
 
   static std::unique_ptr<HeadlessWebContentsImpl> Create(
       HeadlessWebContents::Builder* builder,
       aura::Window* parent_window,
       HeadlessBrowserImpl* browser);
 
   // Takes ownership of |web_contents|.
   static std::unique_ptr<HeadlessWebContentsImpl> CreateFromWebContents(
       content::WebContents* web_contents,
       HeadlessBrowserImpl* browser);
 
   // HeadlessWebContents implementation:
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   HeadlessDevToolsTarget* GetDevToolsTarget() override;
 
   // HeadlessDevToolsTarget implementation:
   void AttachClient(HeadlessDevToolsClient* client) override;
   void DetachClient(HeadlessDevToolsClient* client) override;
 
+  // content::WebContentsObserver implementation
+  void DocumentOnLoadCompletedInMainFrame() override;
+
   content::WebContents* web_contents() const;
   bool OpenURL(const GURL& url);
 
   void Close() override;
 
  private:
   // Takes ownership of |web_contents|.
   HeadlessWebContentsImpl(content::WebContents* web_contents,
                           HeadlessBrowserImpl* browser);
 
   void InitializeScreen(aura::Window* parent_window,
                         const gfx::Size& initial_size);
 
+  using EmbedderMojoService = HeadlessWebContents::Builder::EmbedderMojoService;
+
+  void InstallMojoServices(
+      std::list<EmbedderMojoService>& embedder_mojo_services);

[Sami, 2016/06/10 10:27:38]

const or turn into a pointer if it needs to be mutable?

edit: looks like you're moving this so it could be just a plain value.

[alex clarke (OOO till 29th), 2016/06/11 20:51:50]

Done.

+
   class Delegate;
   std::unique_ptr<Delegate> web_contents_delegate_;
   std::unique_ptr<content::WebContents> web_contents_;
   scoped_refptr<content::DevToolsAgentHost> agent_host_;
+  std::list<EmbedderMojoService> embedder_mojo_services_;
 
   HeadlessBrowserImpl* browser_;  // Not owned.
 
   using ObserverMap =
       std::unordered_map<HeadlessWebContents::Observer*,
                          std::unique_ptr<WebContentsObserverAdapter>>;
   ObserverMap observer_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_