Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2904)

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 11411280: Sync FileSystem: Use app id part of the URL for its directory title. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testfix Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 fa49969163c897d8a49f7d2b343360284b340161..a98b5a55cf292eefb736c302f7489309a486f92d 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -21,8 +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 "net/base/escape.h"
+#include "extensions/common/constants.h"
#include "webkit/fileapi/file_system_url.h"
#include "webkit/fileapi/syncable/sync_file_metadata.h"
#include "webkit/fileapi/syncable/sync_file_type.h"
@@ -248,6 +249,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 +425,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));

Powered by Google App Engine
This is Rietveld 408576698