chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc - Issue 7966020: [Sync] Fix Session's handling of windows.

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/sync/test/integration/single_client_sessions_sync_test.cc

Issue 7966020: [Sync] Fix Session's handling of windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments Created 9 years, 2 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/sync/test/integration/sessions_helper.cc ('K') | « chrome/browser/sync/test/integration/sessions_helper.cc ('k') | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

index 2aa14e9a86e41885260d5cd44324f64b9cc49558..b96e8ebe2ca9144cb2158c17d6076cb4aba19da1 100644

--- a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

+++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

@@ -12,6 +12,8 @@ using sessions_helper::CheckInitialState;

using sessions_helper::GetLocalWindows;

using sessions_helper::GetSessionData;

using sessions_helper::OpenTabAndGetLocalWindows;

+using sessions_helper::ScopedWindowMap;

+using sessions_helper::SyncedSessionVector;

using sessions_helper::WindowsMatch;

class SingleClientSessionsSyncTest : public SyncTest {

@@ -28,7 +30,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, Sanity) {

ASSERT_TRUE(CheckInitialState(0));

- ScopedVector<SessionWindow> old_windows;

+ ScopedWindowMap old_windows;

ASSERT_TRUE(OpenTabAndGetLocalWindows(0,

GURL("about:bubba"),

old_windows.get()));

@@ -42,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, Sanity) {

ASSERT_EQ(0U, sessions.size());

// Verify client didn't change.

- ScopedVector<SessionWindow> new_windows;

+ ScopedWindowMap new_windows;

ASSERT_TRUE(GetLocalWindows(0, new_windows.get()));

- ASSERT_TRUE(WindowsMatch(old_windows.get(), new_windows.get()));

+ ASSERT_TRUE(WindowsMatch(*old_windows.get(), *new_windows.get()));

}