Chromium Code Reviews| Index: chrome/browser/sync_file_system/local_file_sync_service.cc |
| diff --git a/chrome/browser/sync_file_system/local_file_sync_service.cc b/chrome/browser/sync_file_system/local_file_sync_service.cc |
| index 13cbefb76a7fcb27f890c191ee325648d0ca17a2..3a2bae35369501c624707d65e8da4bb3e7136f83 100644 |
| --- a/chrome/browser/sync_file_system/local_file_sync_service.cc |
| +++ b/chrome/browser/sync_file_system/local_file_sync_service.cc |
| @@ -21,6 +21,7 @@ |
| #include "webkit/browser/fileapi/syncable/local_file_change_tracker.h" |
| #include "webkit/browser/fileapi/syncable/local_file_sync_context.h" |
| #include "webkit/browser/fileapi/syncable/sync_file_metadata.h" |
| +#include "webkit/browser/fileapi/syncable/sync_file_system_backend.h" |
| using content::BrowserThread; |
| using fileapi::FileSystemURL; |
| @@ -283,9 +284,11 @@ void LocalFileSyncService::OnChangesAvailableInOrigins( |
| } |
| need_notification = true; |
| fileapi::FileSystemContext* context = origin_to_contexts_[origin]; |
| - DCHECK(context->change_tracker()); |
| + SyncFileSystemBackend* backend = SyncFileSystemBackend::GetBackend(context); |
| + DCHECK(backend); |
| + DCHECK(backend->change_tracker()); |
| origin_change_map_.SetOriginChangeCount( |
| - origin, context->change_tracker()->num_changes()); |
| + origin, backend->change_tracker()->num_changes()); |
|
kinuko
2013/07/17 15:01:30
I think these changes can be made later in a separ
nhiroki
2013/07/22 04:34:14
Hmm... these changes are needed for compiling succ
nhiroki
2013/07/22 06:33:38
Reverted. I'll make a separate CL.
|
| } |
| if (!need_notification) |
| return; |
| @@ -316,9 +319,12 @@ void LocalFileSyncService::DidInitializeFileSystemContext( |
| pending_origins_with_changes_.end()) { |
| // We have remaining changes for the origin. |
| pending_origins_with_changes_.erase(app_origin); |
| - DCHECK(file_system_context->change_tracker()); |
| + SyncFileSystemBackend* backend = |
| + SyncFileSystemBackend::GetBackend(file_system_context); |
| + DCHECK(backend); |
| + DCHECK(backend->change_tracker()); |
| origin_change_map_.SetOriginChangeCount( |
| - app_origin, file_system_context->change_tracker()->num_changes()); |
| + app_origin, backend->change_tracker()->num_changes()); |
| int64 num_changes = origin_change_map_.GetTotalChangeCount(); |
| FOR_EACH_OBSERVER(Observer, change_observers_, |
| OnLocalChangeAvailable(num_changes)); |