chrome/browser/sync/engine/apply_updates_command_unittest.cc - Issue 8468023: Move encryption related files from util folder to encryption folder.

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: chrome/browser/sync/engine/apply_updates_command_unittest.cc

Issue 8468023: Move encryption related files from util folder to encryption folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: For review. Created 9 years, 1 month 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

« chrome/browser/sync/encryption/nigori_util.cc ('K') | « chrome/browser/sync/encryption/nigori_util_unittest.cc ('k') | chrome/browser/sync/engine/get_commit_ids_command.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 <string>	5 #include <string>

6	6

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

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

9 #include "base/stringprintf.h"	9 #include "base/stringprintf.h"

10 #include "chrome/browser/sync/engine/apply_updates_command.h"	10 #include "chrome/browser/sync/engine/apply_updates_command.h"

11 #include "chrome/browser/sync/engine/nigori_util.h"	11 #include "chrome/browser/sync/encryption/nigori_util.h"

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

13 #include "chrome/browser/sync/engine/syncer_util.h"	13 #include "chrome/browser/sync/engine/syncer_util.h"

14 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"	14 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"

15 #include "chrome/browser/sync/protocol/password_specifics.pb.h"	15 #include "chrome/browser/sync/protocol/password_specifics.pb.h"

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

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

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

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

20 #include "chrome/browser/sync/test/engine/syncer_command_test.h"	20 #include "chrome/browser/sync/test/engine/syncer_command_test.h"

21 #include "chrome/browser/sync/test/engine/test_id_factory.h"	21 #include "chrome/browser/sync/test/engine/test_id_factory.h"

(...skipping 656 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
678 encrypted_types.insert(syncable::BOOKMARKS);	678 encrypted_types.insert(syncable::BOOKMARKS);

679 EXPECT_EQ(GetAllRealModelTypes(), cryptographer->GetEncryptedTypes());	679 EXPECT_EQ(GetAllRealModelTypes(), cryptographer->GetEncryptedTypes());

680	680

681 Syncer::UnsyncedMetaHandles handles;	681 Syncer::UnsyncedMetaHandles handles;

682 SyncerUtil::GetUnsyncedEntries(&trans, &handles);	682 SyncerUtil::GetUnsyncedEntries(&trans, &handles);

683 EXPECT_EQ(2*batch_s+1, handles.size());	683 EXPECT_EQ(2*batch_s+1, handles.size());

684 }	684 }

685 }	685 }

686	686

687 } // namespace browser_sync	687 } // namespace browser_sync

OLD	NEW