| 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/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "chrome/browser/sync/engine/apply_updates_command.h" | 9 #include "chrome/browser/sync/engine/apply_updates_command.h" |
| 10 #include "chrome/browser/sync/engine/syncer.h" | 10 #include "chrome/browser/sync/engine/syncer.h" |
| 11 #include "chrome/browser/sync/engine/syncer_util.h" | 11 #include "chrome/browser/sync/engine/syncer_util.h" |
| 12 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" | 12 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" |
| 13 #include "chrome/browser/sync/protocol/password_specifics.pb.h" |
| 13 #include "chrome/browser/sync/sessions/sync_session.h" | 14 #include "chrome/browser/sync/sessions/sync_session.h" |
| 14 #include "chrome/browser/sync/syncable/directory_manager.h" | 15 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 15 #include "chrome/browser/sync/syncable/nigori_util.h" | 16 #include "chrome/browser/sync/syncable/nigori_util.h" |
| 16 #include "chrome/browser/sync/syncable/syncable.h" | 17 #include "chrome/browser/sync/syncable/syncable.h" |
| 17 #include "chrome/browser/sync/syncable/syncable_id.h" | 18 #include "chrome/browser/sync/syncable/syncable_id.h" |
| 18 #include "chrome/test/sync/engine/syncer_command_test.h" | 19 #include "chrome/test/sync/engine/syncer_command_test.h" |
| 19 #include "chrome/test/sync/engine/test_id_factory.h" | 20 #include "chrome/test/sync/engine/test_id_factory.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 21 | 22 |
| 22 namespace browser_sync { | 23 namespace browser_sync { |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 encrypted_types.clear(); | 569 encrypted_types.clear(); |
| 569 EXPECT_EQ(encrypted_types, GetEncryptedDataTypes(&trans)); | 570 EXPECT_EQ(encrypted_types, GetEncryptedDataTypes(&trans)); |
| 570 | 571 |
| 571 Syncer::UnsyncedMetaHandles handles; | 572 Syncer::UnsyncedMetaHandles handles; |
| 572 SyncerUtil::GetUnsyncedEntries(&trans, &handles); | 573 SyncerUtil::GetUnsyncedEntries(&trans, &handles); |
| 573 EXPECT_EQ(2*batch_s+1, handles.size()); | 574 EXPECT_EQ(2*batch_s+1, handles.size()); |
| 574 } | 575 } |
| 575 } | 576 } |
| 576 | 577 |
| 577 } // namespace browser_sync | 578 } // namespace browser_sync |
| OLD | NEW |