Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: chrome/browser/sync/engine/apply_updates_command_unittest.cc

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/engine/DEPS ('k') | chrome/browser/sync/engine/conflict_resolver.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/tracked.h" 9 #include "base/tracked.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/engine/syncer.h" 12 #include "chrome/browser/sync/engine/syncer.h"
12 #include "chrome/browser/sync/engine/syncer_util.h" 13 #include "chrome/browser/sync/engine/syncer_util.h"
13 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" 14 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
14 #include "chrome/browser/sync/protocol/password_specifics.pb.h" 15 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
15 #include "chrome/browser/sync/sessions/sync_session.h" 16 #include "chrome/browser/sync/sessions/sync_session.h"
16 #include "chrome/browser/sync/syncable/directory_manager.h" 17 #include "chrome/browser/sync/syncable/directory_manager.h"
17 #include "chrome/browser/sync/syncable/nigori_util.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/test/sync/engine/syncer_command_test.h" 20 #include "chrome/test/sync/engine/syncer_command_test.h"
21 #include "chrome/test/sync/engine/test_id_factory.h" 21 #include "chrome/test/sync/engine/test_id_factory.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace browser_sync { 24 namespace browser_sync {
25 25
26 using sessions::SyncSession; 26 using sessions::SyncSession;
27 using std::string; 27 using std::string;
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 encrypted_types.insert(syncable::BOOKMARKS); 625 encrypted_types.insert(syncable::BOOKMARKS);
626 EXPECT_EQ(encrypted_types, cryptographer->GetEncryptedTypes()); 626 EXPECT_EQ(encrypted_types, cryptographer->GetEncryptedTypes());
627 627
628 Syncer::UnsyncedMetaHandles handles; 628 Syncer::UnsyncedMetaHandles handles;
629 SyncerUtil::GetUnsyncedEntries(&trans, &handles); 629 SyncerUtil::GetUnsyncedEntries(&trans, &handles);
630 EXPECT_EQ(2*batch_s+1, handles.size()); 630 EXPECT_EQ(2*batch_s+1, handles.size());
631 } 631 }
632 } 632 }
633 633
634 } // namespace browser_sync 634 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/DEPS ('k') | chrome/browser/sync/engine/conflict_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698