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

Unified Diff: webkit/browser/fileapi/syncable/canned_syncable_file_system.cc

Issue 16109008: Cleanup: Deprecate DriveFileSyncService::kServiceName (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months 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: webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index 2913d69d39fbe9de6ac7ec4e5d67c42e786cd8e1..52681006f7383442450482f1d152b430accdcd73 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -177,11 +177,10 @@ void EnsureLastTaskRuns(base::SingleThreadTaskRunner* runner) {
} // namespace
CannedSyncableFileSystem::CannedSyncableFileSystem(
- const GURL& origin, const std::string& service,
+ const GURL& origin,
base::SingleThreadTaskRunner* io_task_runner,
base::SingleThreadTaskRunner* file_task_runner)
- : service_name_(service),
- origin_(origin),
+ : origin_(origin),
type_(fileapi::kFileSystemTypeSyncable),
result_(base::PLATFORM_FILE_OK),
sync_status_(sync_file_system::SYNC_STATUS_OK),
@@ -248,7 +247,7 @@ PlatformFileError CannedSyncableFileSystem::OpenFileSystem() {
EXPECT_TRUE(is_filesystem_set_up_);
EXPECT_FALSE(is_filesystem_opened_);
file_system_context_->OpenSyncableFileSystem(
- service_name_, origin_, type_,
+ origin_, type_,
fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::Bind(&CannedSyncableFileSystem::DidOpenFileSystem,
base::Unretained(this)));
@@ -282,7 +281,6 @@ SyncStatusCode CannedSyncableFileSystem::MaybeInitializeFileSystemContext(
sync_context->io_task_runner_.get());
sync_context->MaybeInitializeFileSystemContext(
origin_,
- service_name_,
file_system_context_.get(),
base::Bind(&CannedSyncableFileSystem::DidInitializeFileSystemContext,
base::Unretained(this)));

Powered by Google App Engine
This is Rietveld 408576698