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

Unified Diff: content/browser/tab_contents/test_tab_contents.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 | « content/browser/tab_contents/tab_contents_unittest.cc ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/test_tab_contents.cc
diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc
index 60b5a0b423a506f681f498918112bd998263d8a2..f0b6cc4d999c0f01a2970c2a9b801757ba8cedb9 100644
--- a/content/browser/tab_contents/test_tab_contents.cc
+++ b/content/browser/tab_contents/test_tab_contents.cc
@@ -82,12 +82,12 @@ bool TestTabContents::CreateRenderViewForRenderManager(
TabContents* TestTabContents::Clone() {
TabContents* tc = new TestTabContents(
browser_context(), SiteInstance::CreateSiteInstance(browser_context()));
- tc->GetController().CopyStateFrom(controller_);
+ tc->controller().CopyStateFrom(controller_);
return tc;
}
void TestTabContents::NavigateAndCommit(const GURL& url) {
- GetController().LoadURL(
+ controller().LoadURL(
url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
GURL loaded_url(url);
bool reverse_on_redirect = false;
@@ -109,7 +109,7 @@ void TestTabContents::CommitPendingNavigation() {
if (!rvh)
rvh = static_cast<TestRenderViewHost*>(old_rvh);
- const NavigationEntry* entry = GetController().pending_entry();
+ const NavigationEntry* entry = controller().pending_entry();
DCHECK(entry);
int page_id = entry->page_id();
if (page_id == -1) {
« no previous file with comments | « content/browser/tab_contents/tab_contents_unittest.cc ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698