chrome/browser/sessions/session_restore_browsertest.cc - Issue 10831116: Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

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: chrome/browser/sessions/session_restore_browsertest.cc

Issue 10831116: Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mac win compile fixes Created 8 years, 4 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

« chrome/browser/predictors/autocomplete_action_predictor.cc ('K') | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/sessions/session_service.cc » ('j') | content/browser/browser_context.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/session_restore_browsertest.cc

diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc

index 154bf0ab34e6d726b21b28bb5e58274a313e8384..f6eceaf0a2a899be42c00bd7a574a891aff4f56b 100644

--- a/chrome/browser/sessions/session_restore_browsertest.cc

+++ b/chrome/browser/sessions/session_restore_browsertest.cc

@@ -773,17 +773,19 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) {

ui_test_utils::NavigateToURL(browser(), url1_);

const content::NavigationController& controller =

chrome::GetActiveWebContents(browser())->GetController();

- ASSERT_TRUE(controller.GetSessionStorageNamespace());

+ ASSERT_TRUE(controller.GetSessionStorageNamespaceMap().find("")->second);

std::string session_storage_persistent_id =

- controller.GetSessionStorageNamespace()->persistent_id();

+ controller.GetSessionStorageNamespaceMap().find("")

+ ->second->persistent_id();

Browser* new_browser = QuitBrowserAndRestore(browser(), 1);

ASSERT_EQ(1u, BrowserList::size());

ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL());

const content::NavigationController& new_controller =

chrome::GetActiveWebContents(new_browser)->GetController();

- ASSERT_TRUE(new_controller.GetSessionStorageNamespace());

+ ASSERT_TRUE(new_controller.GetSessionStorageNamespaceMap().find("")->second);

std::string restored_session_storage_persistent_id =

- new_controller.GetSessionStorageNamespace()->persistent_id();

+ new_controller.GetSessionStorageNamespaceMap().find("")

+ ->second->persistent_id();

EXPECT_EQ(session_storage_persistent_id,

restored_session_storage_persistent_id);

}