| 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 c7a12a71ac23981eb08db43801ebdfccd40e0642..15691f49b200566218c8d31596a2ac4fc89ad3df 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
|
| @@ -411,7 +411,8 @@ void DriveFileSyncService::RegisterOriginForTrackingChanges(
|
| void DriveFileSyncService::UnregisterOriginForTrackingChanges(
|
| const GURL& origin,
|
| const SyncStatusCallback& callback) {
|
| - scoped_ptr<TaskToken> token(GetToken(FROM_HERE, TASK_TYPE_DATABASE, ""));
|
| + scoped_ptr<TaskToken> token(
|
| + GetToken(FROM_HERE, TASK_TYPE_DATABASE, std::string()));
|
| if (!token) {
|
| pending_tasks_.push_back(base::Bind(
|
| &DriveFileSyncService::UnregisterOriginForTrackingChanges,
|
| @@ -442,7 +443,8 @@ void DriveFileSyncService::EnableOriginForTrackingChanges(
|
| if (!metadata_store_->IsOriginDisabled(origin))
|
| return;
|
|
|
| - scoped_ptr<TaskToken> token(GetToken(FROM_HERE, TASK_TYPE_DATABASE, ""));
|
| + scoped_ptr<TaskToken> token(
|
| + GetToken(FROM_HERE, TASK_TYPE_DATABASE, std::string()));
|
| if (!token) {
|
| pending_tasks_.push_back(base::Bind(
|
| &DriveFileSyncService::EnableOriginForTrackingChanges,
|
| @@ -463,7 +465,8 @@ void DriveFileSyncService::DisableOriginForTrackingChanges(
|
| !metadata_store_->IsIncrementalSyncOrigin(origin))
|
| return;
|
|
|
| - scoped_ptr<TaskToken> token(GetToken(FROM_HERE, TASK_TYPE_DATABASE, ""));
|
| + scoped_ptr<TaskToken> token(
|
| + GetToken(FROM_HERE, TASK_TYPE_DATABASE, std::string()));
|
| if (!token) {
|
| pending_tasks_.push_back(base::Bind(
|
| &DriveFileSyncService::DisableOriginForTrackingChanges,
|
|
|