OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shared_change_processor.h" | 5 #include "chrome/browser/sync/glue/shared_change_processor.h" |
6 | 6 |
7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
8 #include "chrome/browser/sync/profile_sync_service.h" | 8 #include "chrome/browser/sync/profile_sync_service.h" |
9 #include "components/sync_driver/generic_change_processor.h" | 9 #include "components/sync_driver/generic_change_processor.h" |
10 #include "components/sync_driver/generic_change_processor_factory.h" | 10 #include "components/sync_driver/generic_change_processor_factory.h" |
11 #include "components/sync_driver/sync_api_component_factory.h" | 11 #include "components/sync_driver/sync_api_component_factory.h" |
12 #include "sync/api/attachments/attachment_service.h" | 12 #include "sync/api/attachments/attachment_service.h" |
13 #include "sync/api/attachments/fake_attachment_service.h" | 13 #include "sync/api/attachments/fake_attachment_service.h" |
14 #include "sync/api/attachments/fake_attachment_uploader.h" | |
15 #include "sync/api/sync_change.h" | 14 #include "sync/api/sync_change.h" |
| 15 #include "sync/internal_api/public/attachments/fake_attachment_uploader.h" |
16 | 16 |
17 using base::AutoLock; | 17 using base::AutoLock; |
18 | 18 |
19 namespace browser_sync { | 19 namespace browser_sync { |
20 | 20 |
21 SharedChangeProcessor::SharedChangeProcessor() | 21 SharedChangeProcessor::SharedChangeProcessor() |
22 : disconnected_(false), | 22 : disconnected_(false), |
23 type_(syncer::UNSPECIFIED), | 23 type_(syncer::UNSPECIFIED), |
24 sync_service_(NULL), | 24 sync_service_(NULL), |
25 frontend_loop_(base::MessageLoopProxy::current()), | 25 frontend_loop_(base::MessageLoopProxy::current()), |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 return error_handler_->CreateAndUploadError(location, message, type_); | 231 return error_handler_->CreateAndUploadError(location, message, type_); |
232 } else { | 232 } else { |
233 return syncer::SyncError(location, | 233 return syncer::SyncError(location, |
234 syncer::SyncError::DATATYPE_ERROR, | 234 syncer::SyncError::DATATYPE_ERROR, |
235 message, | 235 message, |
236 type_); | 236 type_); |
237 } | 237 } |
238 } | 238 } |
239 | 239 |
240 } // namespace browser_sync | 240 } // namespace browser_sync |
OLD | NEW |