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/stringprintf.h" | 9 #include "base/stringprintf.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/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" |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
676 encrypted_types.insert(syncable::BOOKMARKS); | 676 encrypted_types.insert(syncable::BOOKMARKS); |
677 EXPECT_EQ(GetAllRealModelTypes(), cryptographer->GetEncryptedTypes()); | 677 EXPECT_EQ(GetAllRealModelTypes(), cryptographer->GetEncryptedTypes()); |
678 | 678 |
679 Syncer::UnsyncedMetaHandles handles; | 679 Syncer::UnsyncedMetaHandles handles; |
680 SyncerUtil::GetUnsyncedEntries(&trans, &handles); | 680 SyncerUtil::GetUnsyncedEntries(&trans, &handles); |
681 EXPECT_EQ(2*batch_s+1, handles.size()); | 681 EXPECT_EQ(2*batch_s+1, handles.size()); |
682 } | 682 } |
683 } | 683 } |
684 | 684 |
685 } // namespace browser_sync | 685 } // namespace browser_sync |
OLD | NEW |