Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/chromeos/drive/file_system/copy_operation.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
-#include "chrome/browser/drive/drive_service_interface.h"
 #include "google_apis/drive/gdata_errorcode.h"
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 class Time;
 }  // namespace base
 
 namespace google_apis {
 class AboutResource;
@@ skipping 17 matching lines @@
 
 // This class encapsulates the drive Copy function.  It is responsible for
 // sending the request to the drive API, then updating the local state and
 // metadata to reflect the new state.
 class CopyOperation {
  public:
   CopyOperation(base::SequencedTaskRunner* blocking_task_runner,
                 OperationDelegate* delegate,
                 JobScheduler* scheduler,
                 internal::ResourceMetadata* metadata,
-                internal::FileCache* cache,
-                const ResourceIdCanonicalizer& id_canonicalizer);
+                internal::FileCache* cache);
   ~CopyOperation();
 
   // Performs the copy operation on the file at drive path |src_file_path|
   // with a target of |dest_file_path|.
   // If |preserve_last_modified| is set to true, this tries to preserve
   // last modified time stamp. This is supported only on Drive API v2.
   // Invokes |callback| when finished with the result of the operation.
   // |callback| must not be null.
   void Copy(const base::FilePath& src_file_path,
             const base::FilePath& dest_file_path,
@@ skipping 92 matching lines @@
       const base::FilePath& remote_dest_path,
       const ResourceEntry* entry,
       std::string* local_id,
       FileError error);
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   OperationDelegate* delegate_;
   JobScheduler* scheduler_;
   internal::ResourceMetadata* metadata_;
   internal::FileCache* cache_;
-  ResourceIdCanonicalizer id_canonicalizer_;
 
   // Uploading a new file is internally implemented by creating a dirty file.
   scoped_ptr<CreateFileOperation> create_file_operation_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<CopyOperation> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(CopyOperation);
 };
 
 }  // namespace file_system
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_