Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/chromeos/drive/file_system/copy_operation.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/chromeos/drive/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
@@ skipping 261 matching lines @@
   params->location_type = HAS_PARENT;
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 CopyOperation::CopyOperation(base::SequencedTaskRunner* blocking_task_runner,
                              OperationDelegate* delegate,
                              JobScheduler* scheduler,
                              internal::ResourceMetadata* metadata,
-                             internal::FileCache* cache,
-                             const ResourceIdCanonicalizer& id_canonicalizer)
+                             internal::FileCache* cache)
   : blocking_task_runner_(blocking_task_runner),
     delegate_(delegate),
     scheduler_(scheduler),
     metadata_(metadata),
     cache_(cache),
-    id_canonicalizer_(id_canonicalizer),
     create_file_operation_(new CreateFileOperation(blocking_task_runner,
                                                    delegate,
                                                    metadata)),
     weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 CopyOperation::~CopyOperation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
@@ skipping 152 matching lines @@
   }
 
   // For regular files, schedule the transfer.
   if (gdoc_resource_id->empty()) {
     ScheduleTransferRegularFile(local_src_path, remote_dest_path, callback);
     return;
   }
 
   // GDoc file may contain a resource ID in the old format.
   const std::string canonicalized_resource_id =
-      id_canonicalizer_.Run(*gdoc_resource_id);
+      util::CanonicalizeResourceId(*gdoc_resource_id);
 
   // Drop the document extension, which should not be in the title.
   // TODO(yoshiki): Remove this code with crbug.com/223304.
   const std::string new_title =
       remote_dest_path.BaseName().RemoveExtension().AsUTF8Unsafe();
 
   // This is uploading a JSON file representing a hosted document.
   TransferJsonGdocParams* params = new TransferJsonGdocParams(
       callback, canonicalized_resource_id, *parent_entry, new_title);
   base::PostTaskAndReplyWithResult(
@@ skipping 188 matching lines @@
     FileChange changed_file;
     changed_file.Update(remote_dest_path, *entry, FileChange::ADD_OR_UPDATE);
     delegate_->OnFileChangedByOperation(changed_file);
     delegate_->OnEntryUpdatedByOperation(*local_id);
   }
   callback.Run(error);
 }
 
 }  // namespace file_system
 }  // namespace drive