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 b26eaa136f6143cf8f6237233c73e847c046ed19..336c14ab05dcc9475fcca41b0ced80412144d8e9 100644 |
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc |
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc |
@@ -89,7 +89,6 @@ void SyncFileCallbackAdapter( |
} // namespace |
-const char DriveFileSyncService::kServiceName[] = "syncfs"; |
ConflictResolutionPolicy DriveFileSyncService::kDefaultPolicy = |
CONFLICT_RESOLUTION_LAST_WRITE_WIN; |
@@ -249,10 +248,6 @@ RemoteServiceState DriveFileSyncService::GetCurrentState() const { |
return state_; |
} |
-const char* DriveFileSyncService::GetServiceName() const { |
- return kServiceName; |
-} |
- |
void DriveFileSyncService::SetSyncEnabled(bool enabled) { |
if (sync_enabled_ == enabled) |
return; |
@@ -586,7 +581,6 @@ void DriveFileSyncService::DoProcessRemoteChange( |
remote_change, callback)); |
remote_change_processor_->PrepareForProcessRemoteChange( |
remote_change.url, |
- kServiceName, |
base::Bind(&DriveFileSyncService::DidPrepareForProcessRemoteChange, |
AsWeakPtr(), base::Passed(¶m))); |
} |
@@ -776,7 +770,7 @@ void DriveFileSyncService::DidGetDirectoryContentForBatchSync( |
base::FilePath path = TitleToPath(entry.title()); |
fileapi::FileSystemURL url(CreateSyncableFileSystemURL( |
- origin, kServiceName, path)); |
+ origin, path)); |
// TODO(calvinlo): Write metadata and origin data as single batch command |
// so it's not possible for the DB to contain a DriveMetadata with an |
// unknown origin. |
@@ -1291,8 +1285,7 @@ bool DriveFileSyncService::AppendRemoteChangeInternal( |
const base::Time& updated_time, |
SyncFileType file_type, |
RemoteChangeHandler::RemoteSyncType sync_type) { |
- fileapi::FileSystemURL url( |
- CreateSyncableFileSystemURL(origin, kServiceName, path)); |
+ fileapi::FileSystemURL url(CreateSyncableFileSystemURL(origin, path)); |
DCHECK(url.is_valid()); |
// Note that we create a normalized path from url.path() rather than |