content/browser/tab_contents/navigation_controller_impl_unittest.cc - Issue 9706012: Add abstractions that let embedders drive tests of WebContents.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/tab_contents/navigation_controller_impl_unittest.cc

Issue 9706012: Add abstractions that let embedders drive tests of WebContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove CONTENT_EXPORT on statically linked functions. Merge to head for commit. Created 8 years, 9 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

« no previous file with comments | « content/browser/site_instance_impl_unittest.cc ('k') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/navigation_controller_impl_unittest.cc

diff --git a/content/browser/tab_contents/navigation_controller_impl_unittest.cc b/content/browser/tab_contents/navigation_controller_impl_unittest.cc

index 3120fe3555f93b337a3fa834950f38d743cfe90f..1546571a58f255927815da0443fa8f3ec8463d00 100644

--- a/content/browser/tab_contents/navigation_controller_impl_unittest.cc

+++ b/content/browser/tab_contents/navigation_controller_impl_unittest.cc

@@ -2083,7 +2083,8 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPrune) {

EXPECT_EQ(1, controller.GetEntryAtIndex(1)->GetPageID());

EXPECT_EQ(1, contents()->GetMaxPageIDForSiteInstance(instance1));

- scoped_ptr<TestTabContents> other_contents(CreateTestTabContents());

+ scoped_ptr<TestTabContents> other_contents(

+ static_cast<TestTabContents*>(CreateTestWebContents()));

NavigationControllerImpl& other_controller =

other_contents->GetControllerImpl();

other_contents->NavigateAndCommit(url3);

@@ -2128,7 +2129,8 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPrune2) {

NavigateAndCommit(url2);

controller.GoBack();

- scoped_ptr<TestTabContents> other_contents(CreateTestTabContents());

+ scoped_ptr<TestTabContents> other_contents(

+ static_cast<TestTabContents*>(CreateTestWebContents()));

NavigationControllerImpl& other_controller =

other_contents->GetControllerImpl();

other_contents->ExpectSetHistoryLengthAndPrune(NULL, 1, -1);

@@ -2162,7 +2164,8 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPrune3) {

NavigateAndCommit(url2);

controller.GoBack();

- scoped_ptr<TestTabContents> other_contents(CreateTestTabContents());

+ scoped_ptr<TestTabContents> other_contents(

+ static_cast<TestTabContents*>(CreateTestWebContents()));

NavigationControllerImpl& other_controller =

other_contents->GetControllerImpl();

other_controller.LoadURL(

@@ -2212,7 +2215,8 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPruneMaxEntries) {

NavigateAndCommit(url2);

NavigateAndCommit(url3);

- scoped_ptr<TestTabContents> other_contents(CreateTestTabContents());

+ scoped_ptr<TestTabContents> other_contents(

+ static_cast<TestTabContents*>(CreateTestWebContents()));

NavigationControllerImpl& other_controller =

other_contents->GetControllerImpl();

other_contents->NavigateAndCommit(url4);