[headless] AddWindowTreeClient

headless/lib/browser/headless_browser_impl.cc

Index: headless/lib/browser/headless_browser_impl.cc
diff --git a/headless/lib/browser/headless_browser_impl.cc b/headless/lib/browser/headless_browser_impl.cc
index 57564d7ddc8828994e61fb7eaa84003b5e88462a..03c9fd2e4b8cbcea13e26b330830786b427ef4ec 100644
--- a/headless/lib/browser/headless_browser_impl.cc
+++ b/headless/lib/browser/headless_browser_impl.cc
@@ -12,6 +12,7 @@
 #include "headless/lib/browser/headless_browser_context.h"
 #include "headless/lib/browser/headless_browser_main_parts.h"
 #include "headless/lib/browser/headless_web_contents_impl.h"
+#include "headless/lib/browser/headless_window_tree_client.h"
 #include "headless/lib/headless_content_main_delegate.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
@@ -30,19 +31,18 @@ HeadlessBrowserImpl::HeadlessBrowserImpl(
 
 HeadlessBrowserImpl::~HeadlessBrowserImpl() {}
 
-std::unique_ptr<HeadlessWebContents> HeadlessBrowserImpl::CreateWebContents(
+HeadlessWebContents* HeadlessBrowserImpl::CreateWebContents(
     const GURL& initial_url,
     const gfx::Size& size) {
   DCHECK(BrowserMainThread()->BelongsToCurrentThread());
-  std::unique_ptr<HeadlessWebContentsImpl> web_contents =
-      base::WrapUnique(new HeadlessWebContentsImpl(
-          browser_context(), window_tree_host_->window(), size));
-  // We require the user to pass in an initial URL to ensure that the renderer

[Sami, 2016/04/20 17:42:57]

Any reason to remove this comment? I think it's still useful, although
s/WebContentsReady/DevToolsTargetReady/ :)

[altimin, 2016/04/20 18:11:56]

Done.

-  // gets initialized and eventually becomes ready to be inspected. See
-  // HeadlessWebContents::Observer::WebContentsReady.
-  if (!web_contents->OpenURL(initial_url))
+  std::unique_ptr<HeadlessWebContentsImpl> headless_web_contents =
+      HeadlessWebContentsImpl::Create(browser_context(),
+                                      window_tree_host_->window(), size, this);
+
+  if (!headless_web_contents->OpenURL(initial_url))
     return nullptr;
-  return std::move(web_contents);
+
+  return RegisterWebContents(std::move(headless_web_contents));
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
@@ -57,6 +57,17 @@ void HeadlessBrowserImpl::Shutdown() {
                                 base::MessageLoop::QuitWhenIdleClosure());
 }
 
+std::vector<HeadlessWebContents*> HeadlessBrowserImpl::GetAllWebContents() {
+  std::vector<HeadlessWebContents*> result;
+  result.reserve(web_contents_.size());
+
+  for (const auto& web_contents_pair : web_contents_) {
+    result.push_back(web_contents_pair.first);
+  }
+
+  return result;
+}
+
 HeadlessBrowserContext* HeadlessBrowserImpl::browser_context() const {
   DCHECK(BrowserMainThread()->BelongsToCurrentThread());
   DCHECK(browser_main_parts());
@@ -79,10 +90,27 @@ void HeadlessBrowserImpl::RunOnStartCallback() {
   window_tree_host_.reset(aura::WindowTreeHost::Create(gfx::Rect()));
   window_tree_host_->InitHost();
 
+  window_tree_client_.reset(
+      new HeadlessWindowTreeClient(window_tree_host_->window()));
+
   on_start_callback_.Run(this);
   on_start_callback_ = base::Callback<void(HeadlessBrowser*)>();
 }
 
+HeadlessWebContentsImpl* HeadlessBrowserImpl::RegisterWebContents(
+    std::unique_ptr<HeadlessWebContentsImpl> web_contents) {
+  HeadlessWebContentsImpl* unowned_web_contents = web_contents.get();
+  web_contents_[unowned_web_contents] = std::move(web_contents);
+  return unowned_web_contents;
+}
+
+void HeadlessBrowserImpl::DestroyWebContents(
+    HeadlessWebContentsImpl* web_contents) {
+  auto it = web_contents_.find(web_contents);
+  DCHECK(it != web_contents_.end());
+  web_contents_.erase(it);
+}
+
 void HeadlessBrowserImpl::SetOptionsForTesting(
     const HeadlessBrowser::Options& options) {
   options_ = options;