Chromecast browser test: use CastContentWindow for test lifetime.

chromecast/browser/test/chromecast_browser_test.cc

 // 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.
 
 #include "chromecast/browser/test/chromecast_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chromecast/browser/cast_browser_context.h"
 #include "chromecast/browser/cast_browser_process.h"
+#include "chromecast/browser/cast_content_window.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 
 namespace chromecast {
 namespace shell {
 
 ChromecastBrowserTest::ChromecastBrowserTest()
@@ skipping 22 matching lines @@
 
   TearDownOnMainThread();
 
   for (content::RenderProcessHost::iterator i(
            content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->FastShutdownIfPossible();
   }
 
   web_contents_.reset();
+  window_.reset();
 }
 
 void ChromecastBrowserTest::NavigateToURL(content::WebContents* window,
                                           const GURL& url) {
   content::WaitForLoadStop(window);
   content::TestNavigationObserver same_tab_observer(window, 1);
   content::NavigationController::LoadURLParams params(url);
   params.transition_type = ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED |
       ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
   window->GetController().LoadURLWithParams(params);
   same_tab_observer.Wait();
 }
 
 content::WebContents* ChromecastBrowserTest::CreateBrowser() {
-  content::WebContents::CreateParams create_params(
-      CastBrowserProcess::GetInstance()->browser_context(),
-      NULL);
-  create_params.routing_id = MSG_ROUTING_NONE;
-  create_params.initial_size = gfx::Size(1280, 720);
-  web_contents_.reset(content::WebContents::Create(create_params));
+  window_.reset(new CastContentWindow);
+  gfx::Size initial_size(1280, 720);
+  web_contents_ = window_->Create(
+      initial_size, CastBrowserProcess::GetInstance()->browser_context());
   return web_contents_.get();
 }
 
 }  // namespace shell
 }  // namespace chromecast