Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/chromeos/drive/resource_metadata_storage.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/drive/drive_api_util.h"
 #include "third_party/leveldatabase/env_chromium.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
 namespace drive {
 namespace internal {
 
 namespace {
 
 // Enum to describe DB initialization status.
@@ skipping 183 matching lines @@
   }
 }
 
 bool ResourceMetadataStorage::Iterator::HasError() const {
   base::ThreadRestrictions::AssertIOAllowed();
   return !it_->status().ok();
 }
 
 // static
 bool ResourceMetadataStorage::UpgradeOldDB(
-    const base::FilePath& directory_path,
-    const ResourceIdCanonicalizer& id_canonicalizer) {
+    const base::FilePath& directory_path) {
   base::ThreadRestrictions::AssertIOAllowed();
   COMPILE_ASSERT(
       kDBVersion == 13,
       db_version_and_this_function_should_be_updated_at_the_same_time);
 
   const base::FilePath resource_map_path =
       directory_path.Append(kResourceMapDBName);
   const base::FilePath preserved_resource_map_path =
       directory_path.Append(kPreservedResourceMapDBName);
 
@@ skipping 71 matching lines @@
     // Put ID entries and cache entries.
     for (it->SeekToFirst(); it->Valid(); it->Next()) {
       if (IsCacheEntryKey(it->key())) {
         FileCacheEntry cache_entry;
         if (!cache_entry.ParseFromArray(it->value().data(), it->value().size()))
           return false;
 
         // The resource ID might be in old WAPI format. We need to canonicalize
         // to the format of API service currently in use.
         const std::string& id = GetIdFromCacheEntryKey(it->key());
-        const std::string& id_new = id_canonicalizer.Run(id);
+        const std::string& id_new = util::CanonicalizeResourceId(id);
 
         // Before v11, resource ID was directly used as local ID. Such entries
         // can be migrated by adding an identity ID mapping.
         batch.Put(GetIdEntryKey(id_new), id_new);
 
         // Put cache state into a ResourceEntry.
         ResourceEntry entry;
         entry.set_local_id(id_new);
         entry.set_resource_id(id_new);
         *entry.mutable_file_specific_info()->mutable_cache_state() =
@@ skipping 682 matching lines @@
   if (!it->status().ok() || num_child_entries != num_entries_with_parent) {
     DLOG(ERROR) << "Error during checking resource map. status = "
                 << it->status().ToString();
     return false;
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace drive