[headless] AddWindowTreeClient

headless/lib/headless_web_contents_browsertest.cc

Index: headless/lib/headless_web_contents_browsertest.cc
diff --git a/headless/lib/headless_web_contents_browsertest.cc b/headless/lib/headless_web_contents_browsertest.cc
index aaa5491882b03110142178172184bd9ff6f69123..9c5aac37c4a8131d89e352d9f2b390a00ea1e997 100644
--- a/headless/lib/headless_web_contents_browsertest.cc
+++ b/headless/lib/headless_web_contents_browsertest.cc
@@ -39,9 +39,8 @@ class NavigationObserver : public HeadlessWebContents::Observer {
 
 IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest, Navigation) {
   EXPECT_TRUE(embedded_test_server()->Start());
-  std::unique_ptr<HeadlessWebContents> web_contents =
-      browser()->CreateWebContents(
-          embedded_test_server()->GetURL("/hello.html"), gfx::Size(800, 600));
+  HeadlessWebContents* web_contents = browser()->CreateWebContents(
+      embedded_test_server()->GetURL("/hello.html"), gfx::Size(800, 600));
   NavigationObserver observer(this);
   web_contents->AddObserver(&observer);
 
@@ -49,6 +48,36 @@ IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest, Navigation) {
 
   EXPECT_TRUE(observer.navigation_succeeded());
   web_contents->RemoveObserver(&observer);
+
+  std::vector<HeadlessWebContents*> all_web_contents =
+      browser()->GetAllWebContents();
+
+  EXPECT_EQ(all_web_contents.size(), static_cast<size_t>(1));
+  EXPECT_EQ(all_web_contents[0], web_contents);
+  EXPECT_TRUE(web_contents->IsDirectlyCreated());
+}
+
+IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest, WindowOpen) {
+  EXPECT_TRUE(embedded_test_server()->Start());
+
+  HeadlessWebContents* web_contents = browser()->CreateWebContents(
+      embedded_test_server()->GetURL("/window_open.html"), gfx::Size(800, 600));
+  NavigationObserver observer(this);
+  web_contents->AddObserver(&observer);
+
+  RunAsynchronousTest();
+
+  EXPECT_TRUE(observer.navigation_succeeded());
+  web_contents->RemoveObserver(&observer);
+
+  std::vector<HeadlessWebContents*> all_web_contents =
+      browser()->GetAllWebContents();
+
+  EXPECT_EQ(all_web_contents.size(), static_cast<size_t>(2));
+
+  // Check that one WebContents was directly created, while other wasn't.
+  EXPECT_TRUE(all_web_contents[0]->IsDirectlyCreated() !=
+              all_web_contents[1]->IsDirectlyCreated());
 }
 
 }  // namespace headless