content/browser/tab_contents/navigation_controller_impl_unittest.cc - Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th...

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 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 8 years, 11 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

« content/browser/site_instance_impl.h ('K') | « content/browser/tab_contents/navigation_controller_impl.cc ('k') | content/browser/tab_contents/navigation_entry_impl.h » ('j') | content/browser/tab_contents/render_view_host_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/navigation_controller_impl_unittest.cc

===================================================================

--- content/browser/tab_contents/navigation_controller_impl_unittest.cc (revision 118952)

+++ content/browser/tab_contents/navigation_controller_impl_unittest.cc (working copy)

@@ -17,7 +17,7 @@

// #include "chrome/browser/sessions/session_service_test_helper.h"

// #include "chrome/browser/sessions/session_types.h"

#include "content/browser/renderer_host/test_render_view_host.h"

-#include "content/browser/site_instance.h"

+#include "content/browser/site_instance_impl.h"

#include "content/browser/tab_contents/navigation_controller_impl.h"

#include "content/browser/tab_contents/navigation_entry_impl.h"

#include "content/browser/tab_contents/tab_contents.h"

@@ -37,6 +37,7 @@

using content::NavigationController;

using content::NavigationEntry;

using content::NavigationEntryImpl;

+using content::SiteInstance;

using content::WebContents;

// NavigationControllerTest ----------------------------------------------------

@@ -760,8 +761,9 @@

// We know all the entries have the same site instance, so we can just grab

// a random one for looking up other entries.

- SiteInstance* site_instance = NavigationEntryImpl::FromNavigationEntry(

- controller.GetLastCommittedEntry())->site_instance();

+ SiteInstance* site_instance =

+ NavigationEntryImpl::FromNavigationEntry(

+ controller.GetLastCommittedEntry())->site_instance();

// That second URL should be the last committed and it should have gotten the

// new title.

@@ -1578,7 +1580,7 @@

EXPECT_EQ(url,

NavigationEntryImpl::FromNavigationEntry(

our_controller.GetLastCommittedEntry())->site_instance()->

- site());

+ GetSite());

EXPECT_EQ(NavigationEntryImpl::RESTORE_NONE,

NavigationEntryImpl::FromNavigationEntry(

our_controller.GetEntryAtIndex(0))->restore_type());

@@ -1658,7 +1660,7 @@

EXPECT_EQ(url,

NavigationEntryImpl::FromNavigationEntry(

our_controller.GetLastCommittedEntry())->site_instance()->

- site());

+ GetSite());

EXPECT_EQ(NavigationEntryImpl::RESTORE_NONE,

NavigationEntryImpl::FromNavigationEntry(

our_controller.GetEntryAtIndex(0))->restore_type());