Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

chrome/browser/chromeos/login/screen_locker_tester.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/screen_locker_tester.h"
 
 #include <string>
 
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/webui/web_ui.h"
+#include "content/public/browser/web_contents.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/root_view.h"
 
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/login/lock_window_gtk.h"
 #endif
 
+using content::WebContents;
+
 namespace {
 
 class LoginAttemptObserver : public chromeos::LoginStatusConsumer {
  public:
   explicit LoginAttemptObserver(chromeos::ScreenLocker* locker);
   virtual ~LoginAttemptObserver();
 
   void WaitForAttempt();
 
   // Overridden from LoginStatusConsumer:
@@ skipping 119 matching lines @@
 views::Widget* WebUIScreenLockerTester::GetWidget() const {
   return webui_screen_locker()->lock_window_;
 }
 
 views::Widget* WebUIScreenLockerTester::GetChildWidget() const {
   return webui_screen_locker()->lock_window_;
 }
 
 base::Value* WebUIScreenLockerTester::ExecuteJavascriptAndGetValue(
     const std::string& js_text) {
-  RenderViewHost* rvh = webui()->tab_contents()->GetRenderViewHost();
+  RenderViewHost* rvh = webui()->web_contents()->GetRenderViewHost();
   return rvh->ExecuteJavascriptAndGetValue(string16(),
                                            ASCIIToUTF16(js_text));
 }
 
 WebUIScreenLocker* WebUIScreenLockerTester::webui_screen_locker() const {
   DCHECK(ScreenLocker::screen_locker_);
   return static_cast<WebUIScreenLocker*>(
       ScreenLocker::screen_locker_->delegate_.get());
 }
 
@@ skipping 22 matching lines @@
       new MockAuthenticator(ScreenLocker::screen_locker_, user, password));
 }
 
 }  // namespace test
 
 test::ScreenLockerTester* ScreenLocker::GetTester() {
   return new test::WebUIScreenLockerTester();
 }
 
 }  // namespace chromeos