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..686cad8fd8ed9c1e8c315aa7185f74df1dfc4c52 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/syncable_sandbox_mount_point_provider.h" |
using content::BrowserThread; |
using fileapi::FileSystemURL; |
@@ -283,9 +284,12 @@ void LocalFileSyncService::OnChangesAvailableInOrigins( |
} |
need_notification = true; |
fileapi::FileSystemContext* context = origin_to_contexts_[origin]; |
- DCHECK(context->change_tracker()); |
+ SyncableSandboxMountPointProvider* provider = |
+ SyncableSandboxMountPointProvider::GetProvider(context); |
+ DCHECK(provider); |
+ DCHECK(provider->change_tracker()); |
origin_change_map_.SetOriginChangeCount( |
- origin, context->change_tracker()->num_changes()); |
+ origin, provider->change_tracker()->num_changes()); |
} |
if (!need_notification) |
return; |
@@ -316,9 +320,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()); |
+ SyncableSandboxMountPointProvider* provider = |
+ SyncableSandboxMountPointProvider::GetProvider(file_system_context); |
+ DCHECK(provider); |
+ DCHECK(provider->change_tracker()); |
origin_change_map_.SetOriginChangeCount( |
- app_origin, file_system_context->change_tracker()->num_changes()); |
+ app_origin, provider->change_tracker()->num_changes()); |
int64 num_changes = origin_change_map_.GetTotalChangeCount(); |
FOR_EACH_OBSERVER(Observer, change_observers_, |
OnLocalChangeAvailable(num_changes)); |