chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc - Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match.

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/two_client_bookmarks_sync_test.cc

Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 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

« no previous file with comments | « chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc ('k') | chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 92da52c6c39a228dd320dbe33826ceaed96a86b3..5ca7347af63ac65c44ea551ef5a0be729ff8cda9 100644

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

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

@@ -24,7 +24,7 @@

#include "components/policy/core/common/mock_configuration_policy_provider.h"

#include "components/policy/core/common/policy_map.h"

#include "components/policy/core/common/policy_types.h"

-#include "components/sync/sessions/sync_session_snapshot.h"

+#include "components/sync/engine/cycle/sync_cycle_snapshot.h"

#include "policy/policy_constants.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "ui/base/layout.h"

@@ -2021,15 +2021,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,

ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService((1))));

ASSERT_TRUE(AwaitQuiescence());

EXPECT_TRUE(AllModelsMatch());

- ASSERT_EQ(0,

- GetClient(1)->GetLastSessionSnapshot().num_encryption_conflicts());

+ ASSERT_EQ(0, GetClient(1)->GetLastCycleSnapshot().num_encryption_conflicts());

// Ensure everything is syncing normally by appending a final bookmark.

ASSERT_TRUE(AddURL(1, 5, IndexedURLTitle(5), GURL(IndexedURL(5))) != NULL);

ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));

EXPECT_TRUE(AllModelsMatch());

- ASSERT_EQ(0,

- GetClient(1)->GetLastSessionSnapshot().num_encryption_conflicts());

+ ASSERT_EQ(0, GetClient(1)->GetLastCycleSnapshot().num_encryption_conflicts());

}

// Deliberately racy rearranging of bookmarks to test that our conflict resolver