sync/sessions/sync_session_unittest.cc - Issue 9699057: [Sync] Move 'sync' target to sync/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: sync/sessions/sync_session_unittest.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/sync/sessions/sync_session.h"	5 #include "sync/sessions/sync_session.h"

6	6

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/location.h"	8 #include "base/location.h"

9 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

10 #include "base/message_loop.h"	10 #include "base/message_loop.h"

11 #include "chrome/browser/sync/engine/conflict_resolver.h"	11 #include "sync/engine/conflict_resolver.h"

12 #include "chrome/browser/sync/engine/syncer_types.h"	12 #include "sync/engine/syncer_types.h"

13 #include "chrome/browser/sync/sessions/session_state.h"	13 #include "sync/sessions/session_state.h"

14 #include "chrome/browser/sync/sessions/status_controller.h"	14 #include "sync/sessions/status_controller.h"

15 #include "chrome/browser/sync/syncable/model_type.h"	15 #include "sync/syncable/model_type.h"

16 #include "chrome/browser/sync/syncable/syncable.h"	16 #include "sync/syncable/syncable.h"

17 #include "chrome/browser/sync/syncable/syncable_id.h"	17 #include "sync/syncable/syncable_id.h"

18 #include "chrome/browser/sync/test/engine/fake_model_worker.h"	18 #include "sync/test/engine/fake_model_worker.h"

19 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h"	19 #include "sync/test/engine/test_directory_setter_upper.h"

20 #include "chrome/browser/sync/test/fake_extensions_activity_monitor.h"	20 #include "sync/test/fake_extensions_activity_monitor.h"

21 #include "testing/gtest/include/gtest/gtest.h"	21 #include "testing/gtest/include/gtest/gtest.h"

22	22

23 using syncable::WriteTransaction;	23 using syncable::WriteTransaction;

24	24

25 namespace browser_sync {	25 namespace browser_sync {

26 namespace sessions {	26 namespace sessions {

27 namespace {	27 namespace {

28	28

29 class SyncSessionTest : public testing::Test,	29 class SyncSessionTest : public testing::Test,

30 public SyncSession::Delegate,	30 public SyncSession::Delegate,

(...skipping 556 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
587 EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);	587 EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);

588 EXPECT_EQ(payload1, original[syncable::PASSWORDS]);	588 EXPECT_EQ(payload1, original[syncable::PASSWORDS]);

589 EXPECT_EQ(payload1, original[syncable::AUTOFILL]);	589 EXPECT_EQ(payload1, original[syncable::AUTOFILL]);

590 EXPECT_EQ(payload2, original[syncable::SESSIONS]);	590 EXPECT_EQ(payload2, original[syncable::SESSIONS]);

591 EXPECT_EQ(payload3, original[syncable::THEMES]);	591 EXPECT_EQ(payload3, original[syncable::THEMES]);

592 }	592 }

593	593

594 } // namespace	594 } // namespace

595 } // namespace sessions	595 } // namespace sessions

596 } // namespace browser_sync	596 } // namespace browser_sync

OLD	NEW

« no previous file with comments | « sync/sessions/sync_session_context_unittest.cc ('k') | sync/sessions/test_util.h » ('j') | no next file with comments »