Chromium Code Reviews| Index: chrome/browser/sync_file_system/drive_file_sync_service.cc |
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc |
| index 3ad2862e5cf19718f0f23721e1861b82a58f569a..01bda249fd81deb93d855bb0cbd793d67e88989a 100644 |
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.cc |
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc |
| @@ -21,7 +21,9 @@ |
| #include "chrome/browser/sync_file_system/drive_metadata_store.h" |
| #include "chrome/browser/sync_file_system/remote_change_processor.h" |
| #include "chrome/browser/sync_file_system/sync_file_system.pb.h" |
| +#include "chrome/common/extensions/extension.h" |
| #include "content/public/browser/browser_thread.h" |
| +#include "extensions/common/constants.h" |
| #include "net/base/escape.h" |
|
nhiroki
2012/11/30 09:17:54
No longer unused?
tzik
2012/12/03 08:12:08
Done.
|
| #include "webkit/fileapi/file_system_url.h" |
| #include "webkit/fileapi/syncable/sync_file_metadata.h" |
| @@ -248,6 +250,7 @@ void DriveFileSyncService::RemoveObserver(Observer* observer) { |
| void DriveFileSyncService::RegisterOriginForTrackingChanges( |
| const GURL& origin, |
| const fileapi::SyncStatusCallback& callback) { |
| + DCHECK(origin.SchemeIs(extensions::kExtensionScheme)); |
| scoped_ptr<TaskToken> token(GetToken( |
| FROM_HERE, TASK_TYPE_DRIVE, "Retrieving origin metadata")); |
| if (!token) { |
| @@ -423,7 +426,7 @@ void DriveFileSyncService::ApplyLocalChange( |
| sync_client_->UploadNewFile( |
| metadata_store_->GetResourceIdForOrigin(url.origin()), |
| local_file_path, |
| - net::EscapePath(url.path().AsUTF8Unsafe()), |
| + url.path().AsUTF8Unsafe(), |
| local_file_metadata.size, |
| base::Bind(&DriveFileSyncService::DidUploadNewFile, |
| AsWeakPtr(), base::Passed(&token), url, callback)); |