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

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

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/test/base/browser_with_test_window_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/web_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc
index 40f0eeefa1a4599d9098c6ddc4d873ab86c49a7b..eeb3d0d3f9b29acccdb0a8dd8f05d6313fb8eb69 100644
--- a/chrome/browser/ui/webui/web_ui_unittest.cc
+++ b/chrome/browser/ui/webui/web_ui_unittest.cc
@@ -26,7 +26,7 @@ class WebUITest : public TabContentsWrapperTestHarness {
// values. This must be increasing for the life of the tests.
static void DoNavigationTest(TabContentsWrapper* wrapper, int page_id) {
TabContents* contents = wrapper->tab_contents();
- NavigationController* controller = &contents->GetController();
+ NavigationController* controller = &contents->controller();
// Start a pending load.
GURL new_tab_url(chrome::kChromeUINewTabURL);
@@ -169,7 +169,7 @@ TEST_F(WebUITest, FocusOnNavigate) {
TabContentsForFocusTest* tc = new TabContentsForFocusTest(
contents()->browser_context(),
SiteInstance::CreateSiteInstance(contents()->browser_context()));
- tc->GetController().CopyStateFrom(controller());
+ tc->controller().CopyStateFrom(controller());
SetContents(tc);
int page_id = 200;
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/test/base/browser_with_test_window_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698