Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/chromeos/drive/resource_metadata_storage.h

 // Copyright 2013 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_RESOURCE_METADATA_STORAGE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_STORAGE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
-#include "chrome/browser/drive/drive_service_interface.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace leveldb {
 class DB;
 class Iterator;
 }
 
@@ skipping 46 matching lines @@
     RecoveredCacheInfo();
     ~RecoveredCacheInfo();
 
     bool is_dirty;
     std::string md5;
     std::string title;
   };
   typedef std::map<std::string, RecoveredCacheInfo> RecoveredCacheInfoMap;
 
   // Returns true if the DB was successfully upgraded to the newest version.
-  static bool UpgradeOldDB(const base::FilePath& directory_path,
-                           const ResourceIdCanonicalizer& id_canonicalizer);
+  static bool UpgradeOldDB(const base::FilePath& directory_path);
 
   ResourceMetadataStorage(const base::FilePath& directory_path,
                           base::SequencedTaskRunner* blocking_task_runner);
 
   const base::FilePath& directory_path() const { return directory_path_; }
 
   // Returns true when cache entries were not loaded to the DB during
   // initialization.
   bool cache_file_scan_is_needed() const { return cache_file_scan_is_needed_; }
 
@@ skipping 69 matching lines @@
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceMetadataStorage);
 };
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_STORAGE_H_