Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6811)

Unified Diff: chrome/browser/ui/webui/web_ui_browsertest.cc

Issue 10534098: TabContentsWrapper -> TabContents, part 51. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/web_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index e5551db5396305cb68a62ec3b8b4f0759e3952d2..5fa65d97f6cca603d9100a67ede9046bd365c99b 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -21,7 +21,7 @@
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"
#include "chrome/browser/ui/webui/web_ui_test_handler.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/test_tab_strip_model_observer.h"
@@ -196,8 +196,7 @@ void WebUIBrowserTest::PreLoadJavascriptLibraries(
void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) {
content::TestNavigationObserver navigation_observer(
content::Source<NavigationController>(
- &browser()->GetSelectedTabContentsWrapper()->web_contents()->
- GetController()),
+ &browser()->GetActiveWebContents()->GetController()),
this, 1);
browser::NavigateParams params(
browser(), GURL(browse_to), content::PAGE_TRANSITION_TYPED);
@@ -223,8 +222,8 @@ void WebUIBrowserTest::BrowsePrintPreload(const GURL& browse_to) {
printing::PrintPreviewTabController* tab_controller =
printing::PrintPreviewTabController::GetInstance();
ASSERT_TRUE(tab_controller);
- TabContentsWrapper* preview_tab = tab_controller->GetPrintPreviewForTab(
- browser()->GetSelectedTabContentsWrapper());
+ TabContents* preview_tab = tab_controller->GetPrintPreviewForTab(
+ browser()->GetActiveTabContents());
ASSERT_TRUE(preview_tab);
SetWebUIInstance(preview_tab->web_contents()->GetWebUI());
}
@@ -465,7 +464,7 @@ bool WebUIBrowserTest::RunJavascriptUsingHandler(
void WebUIBrowserTest::SetupHandlers() {
content::WebUI* web_ui_instance = override_selected_web_ui_ ?
override_selected_web_ui_ :
- browser()->GetSelectedWebContents()->GetWebUI();
+ browser()->GetActiveWebContents()->GetWebUI();
ASSERT_TRUE(web_ui_instance != NULL);
test_handler_->set_web_ui(web_ui_instance);
« no previous file with comments | « chrome/browser/ui/webui/web_dialog_web_contents_delegate.cc ('k') | chrome/browser/ui/webui/web_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698