Cleanup: Deprecate DriveFileSyncService::kServiceName

chrome/browser/sync_file_system/drive_file_sync_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 71 matching lines @@
     const SyncStatusCallback& status_callback,
     const SyncFileCallback& callback,
     SyncStatusCode status,
     const FileSystemURL& url) {
   status_callback.Run(status);
   callback.Run(status, url);
 }
 
 }  // namespace
 
-const char DriveFileSyncService::kServiceName[] = "syncfs";
 ConflictResolutionPolicy DriveFileSyncService::kDefaultPolicy =
     CONFLICT_RESOLUTION_LAST_WRITE_WIN;
 
 struct DriveFileSyncService::ProcessRemoteChangeParam {
   RemoteChangeHandler::RemoteChange remote_change;
   SyncFileCallback callback;
 
   DriveMetadata drive_metadata;
   SyncFileMetadata local_metadata;
   bool metadata_updated;
@@ skipping 139 matching lines @@
   }
   return metadata.conflicted();
 }
 
 RemoteServiceState DriveFileSyncService::GetCurrentState() const {
   if (!sync_enabled_)
     return REMOTE_SERVICE_DISABLED;
   return state_;
 }
 
-const char* DriveFileSyncService::GetServiceName() const {
-  return kServiceName;
-}
-
 void DriveFileSyncService::SetSyncEnabled(bool enabled) {
   if (sync_enabled_ == enabled)
     return;
 
   RemoteServiceState old_state = GetCurrentState();
   sync_enabled_ = enabled;
   if (old_state == GetCurrentState())
     return;
 
   const char* status_message = enabled ? "Sync is enabled" : "Sync is disabled";
@@ skipping 313 matching lines @@
       remote_change_handler_.GetChange(&remote_change);
   DCHECK(has_remote_change);
 
   DVLOG(1) << "ProcessRemoteChange for " << remote_change.url.DebugString()
            << " remote_change:" << remote_change.change.DebugString();
 
   scoped_ptr<ProcessRemoteChangeParam> param(new ProcessRemoteChangeParam(
       remote_change, callback));
   remote_change_processor_->PrepareForProcessRemoteChange(
       remote_change.url,
-      kServiceName,
       base::Bind(&DriveFileSyncService::DidPrepareForProcessRemoteChange,
                  AsWeakPtr(), base::Passed(&param)));
 }
 
 void DriveFileSyncService::DoApplyLocalChange(
     const FileChange& local_file_change,
     const base::FilePath& local_file_path,
     const SyncFileMetadata& local_file_metadata,
     const FileSystemURL& url,
     const SyncStatusCallback& callback) {
@@ skipping 169 matching lines @@
 
     // Save to be fetched file to DB for restore in case of crash.
     DriveMetadata metadata;
     metadata.set_resource_id(entry.resource_id());
     metadata.set_md5_checksum(std::string());
     metadata.set_conflicted(false);
     metadata.set_to_be_fetched(true);
 
     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.
     metadata_store_->UpdateEntry(url, metadata,
                                  base::Bind(&EmptyStatusCallback));
   }
 
   GURL next_feed_url;
   if (feed->GetNextFeedURL(&next_feed_url)) {
     api_util_->ContinueListing(
@@ skipping 494 matching lines @@
 bool DriveFileSyncService::AppendRemoteChangeInternal(
     const GURL& origin,
     const base::FilePath& path,
     bool is_deleted,
     const std::string& remote_resource_id,
     int64 changestamp,
     const std::string& remote_file_md5,
     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
   // path here (as FileSystemURL does extra normalization).
   base::FilePath::StringType normalized_path =
     fileapi::VirtualPath::GetNormalizedFilePath(url.path());
 
   std::string local_resource_id;
   std::string local_file_md5;
 
@@ skipping 428 matching lines @@
     metadata_store_->SetOriginRootDirectory(origin, resource_id);
   }
   callback.Run(status, resource_id);
 }
 
 std::string DriveFileSyncService::sync_root_resource_id() {
   return metadata_store_->sync_root_directory();
 }
 
 }  // namespace sync_file_system