| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/glue/generic_change_processor.h" | 5 #include "chrome/browser/sync/glue/generic_change_processor.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 GenericChangeProcessor* change_processor() { | 64 GenericChangeProcessor* change_processor() { |
| 65 return change_processor_.get(); | 65 return change_processor_.get(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 syncer::UserShare* user_share() { | 68 syncer::UserShare* user_share() { |
| 69 return test_user_share_.user_share(); | 69 return test_user_share_.user_share(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 private: | 72 private: |
| 73 MessageLoop loop; | 73 base::MessageLoop loop; |
| 74 | 74 |
| 75 syncer::SyncMergeResult sync_merge_result_; | 75 syncer::SyncMergeResult sync_merge_result_; |
| 76 base::WeakPtrFactory<syncer::SyncMergeResult> merge_result_ptr_factory_; | 76 base::WeakPtrFactory<syncer::SyncMergeResult> merge_result_ptr_factory_; |
| 77 | 77 |
| 78 syncer::FakeSyncableService fake_syncable_service_; | 78 syncer::FakeSyncableService fake_syncable_service_; |
| 79 base::WeakPtrFactory<syncer::FakeSyncableService> | 79 base::WeakPtrFactory<syncer::FakeSyncableService> |
| 80 syncable_service_ptr_factory_; | 80 syncable_service_ptr_factory_; |
| 81 | 81 |
| 82 DataTypeErrorHandlerMock data_type_error_handler_; | 82 DataTypeErrorHandlerMock data_type_error_handler_; |
| 83 syncer::TestUserShare test_user_share_; | 83 syncer::TestUserShare test_user_share_; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 100 | 100 |
| 101 // Start with a simple test. We can add more in-depth testing later. | 101 // Start with a simple test. We can add more in-depth testing later. |
| 102 EXPECT_EQ(static_cast<size_t>(kNumChildNodes), sync_data.size()); | 102 EXPECT_EQ(static_cast<size_t>(kNumChildNodes), sync_data.size()); |
| 103 } | 103 } |
| 104 } | 104 } |
| 105 | 105 |
| 106 } // namespace | 106 } // namespace |
| 107 | 107 |
| 108 } // namespace browser_sync | 108 } // namespace browser_sync |
| 109 | 109 |
| OLD | NEW |