Seperate creation of WebContents and window tree in CastContentWindow

Let WebContents to be created independantly of setting up the
window tree in CastContentWindow. Allow the window tree to be
created at a later time.

R=gunsch@chromium.org
BUG=

Review URL: https://codereview.chromium.org/823763002

Cr-Commit-Position: refs/heads/master@{#309577}

chromecast/browser/cast_content_window.cc

@@ -59,9 +59,9 @@ CastContentWindow::~CastContentWindow() {
 #endif
 }
 
-scoped_ptr<content::WebContents> CastContentWindow::Create(
+void CastContentWindow::CreateWindowTree(
     const gfx::Size& initial_size,
-    content::BrowserContext* browser_context) {
+    content::WebContents* web_contents) {
 #if defined(USE_AURA)
   // Aura initialization
   // TODO(lcwu): We only need a minimal implementation of gfx::Screen
@@ -84,15 +84,7 @@ scoped_ptr<content::WebContents> CastContentWindow::Create(
   window_tree_host_->window()->SetLayoutManager(
       new CastFillLayout(window_tree_host_->window()));
   window_tree_host_->Show();
-#endif
 
-  content::WebContents::CreateParams create_params(browser_context, NULL);
-  create_params.routing_id = MSG_ROUTING_NONE;
-  create_params.initial_size = initial_size;
-  content::WebContents* web_contents = content::WebContents::Create(
-      create_params);
-
-#if defined(USE_AURA)
   // Add and show content's view/window
   aura::Window* content_window = web_contents->GetNativeView();
   aura::Window* parent = window_tree_host_->window();
@@ -101,6 +93,16 @@ scoped_ptr<content::WebContents> CastContentWindow::Create(
   }
   content_window->Show();
 #endif
+}
+
+scoped_ptr<content::WebContents> CastContentWindow::CreateWebContents(
+    const gfx::Size& initial_size,
+    content::BrowserContext* browser_context) {
+  content::WebContents::CreateParams create_params(browser_context, NULL);
+  create_params.routing_id = MSG_ROUTING_NONE;
+  create_params.initial_size = initial_size;
+  content::WebContents* web_contents = content::WebContents::Create(
+      create_params);
 
   return make_scoped_ptr(web_contents);
 }

chromecast/browser/cast_content_window.h

@@ -30,8 +30,11 @@ class CastContentWindow {
   // Removes the window from the screen.
   ~CastContentWindow();
 
-  // Create a window with the given size.
-  scoped_ptr<content::WebContents> Create(
+  // Create a window with the given size for |web_contents|.
+  void CreateWindowTree(const gfx::Size& initial_size,
+                        content::WebContents* web_contents);
+
+  scoped_ptr<content::WebContents> CreateWebContents(
       const gfx::Size& initial_size,
       content::BrowserContext* browser_context);
 

chromecast/browser/service/cast_service_simple.cc

@@ -64,7 +64,8 @@ void CastServiceSimple::StartInternal() {
   gfx::Size initial_size(1280, 720);
 
   window_.reset(new CastContentWindow);
-  web_contents_ = window_->Create(initial_size, browser_context());
+  web_contents_ = window_->CreateWebContents(initial_size, browser_context());
+  window_->CreateWindowTree(initial_size, web_contents_.get());
 
   web_contents_->GetController().LoadURL(GetStartupURL(),
                                          content::Referrer(),

chromecast/browser/test/chromecast_browser_test.cc

@@ -70,8 +70,9 @@ void ChromecastBrowserTest::NavigateToURL(content::WebContents* window,
 content::WebContents* ChromecastBrowserTest::CreateBrowser() {
   window_.reset(new CastContentWindow);
   gfx::Size initial_size(1280, 720);
-  web_contents_ = window_->Create(
-      initial_size, CastBrowserProcess::GetInstance()->browser_context());
+
+  web_contents_ = window_->CreateWebContents(initial_size, browser_context());
+  window_->CreateWindowTree(initial_size, web_contents_.get());
   return web_contents_.get();
 }