[Chromecast] Add CastWebContents

chromecast/browser/test/cast_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/cast_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 16 matching lines @@
 
 CastBrowserTest::~CastBrowserTest() {}
 
 void CastBrowserTest::SetUp() {
   SetUpCommandLine(base::CommandLine::ForCurrentProcess());
 
   BrowserTestBase::SetUp();
 }
 
 void CastBrowserTest::TearDownOnMainThread() {
-  web_contents_.reset();
-  window_.reset();
+  cast_web_view_.reset();
 
   BrowserTestBase::TearDownOnMainThread();
 }
 
 void CastBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   BrowserTestBase::SetUpCommandLine(command_line);
 
   command_line->AppendSwitch(switches::kNoWifi);
   command_line->AppendSwitchASCII(switches::kTestType, "browser");
 }
 
 void CastBrowserTest::RunTestOnMainThreadLoop() {
   // Pump startup related events.
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   base::RunLoop().RunUntilIdle();
 
   metrics::CastMetricsHelper::GetInstance()->SetDummySessionIdForTesting();
 
   SetUpOnMainThread();
   RunTestOnMainThread();
   TearDownOnMainThread();
 }
 
 content::WebContents* CastBrowserTest::NavigateToURL(const GURL& url) {
-  window_ = CastContentWindow::Create(this);
+  cast_web_view_ = base::WrapUnique(new CastWebView(
+      this, CastBrowserProcess::GetInstance()->browser_context(), nullptr,
+      false /*transparent*/));
 
-  web_contents_ = window_->CreateWebContents(
-      CastBrowserProcess::GetInstance()->browser_context());
-  content::WaitForLoadStop(web_contents_.get());
+  content::WebContents* web_contents = cast_web_view_->web_contents();
+  content::WaitForLoadStop(web_contents);
+  content::TestNavigationObserver same_tab_observer(web_contents, 1);
 
-  content::TestNavigationObserver same_tab_observer(web_contents_.get(), 1);
-  content::NavigationController::LoadURLParams params(url);
-  params.transition_type = ui::PageTransitionFromInt(
-      ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
-  web_contents_->GetController().LoadURLWithParams(params);
+  cast_web_view_->LoadUrl(url);
+
   same_tab_observer.Wait();
 
-  return web_contents_.get();
+  return web_contents;
 }
 
+void CastBrowserTest::OnPageStopped(int reason) {}
+
+void CastBrowserTest::OnLoadingStateChanged(bool loading) {}
+
 void CastBrowserTest::OnWindowDestroyed() {}
 
 void CastBrowserTest::OnKeyEvent(const ui::KeyEvent& key_event) {}
 
 }  // namespace shell
 }  // namespace chromecast