Remove ResourceIdCanonicalizer from DriveServiceInterface

chrome/browser/chromeos/drive/drive_integration_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/chromeos/drive/drive_integration_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
@@ skipping 85 matching lines @@
                             os_cpu_info.c_str());
 }
 
 // Initializes FileCache and ResourceMetadata.
 // Must be run on the same task runner used by |cache| and |resource_metadata|.
 FileError InitializeMetadata(
     const base::FilePath& cache_root_directory,
     internal::ResourceMetadataStorage* metadata_storage,
     internal::FileCache* cache,
     internal::ResourceMetadata* resource_metadata,
-    const ResourceIdCanonicalizer& id_canonicalizer,
     const base::FilePath& downloads_directory) {
   // Files in temporary directory need not persist across sessions. Clean up
   // the directory content while initialization.
   base::DeleteFile(cache_root_directory.Append(kTemporaryFileDirectory),
                    true);  // recursive
   if (!base::CreateDirectory(cache_root_directory.Append(
           kMetadataDirectory)) ||
       !base::CreateDirectory(cache_root_directory.Append(
           kCacheFileDirectory)) ||
       !base::CreateDirectory(cache_root_directory.Append(
           kTemporaryFileDirectory))) {
     LOG(WARNING) << "Failed to create directories.";
     return FILE_ERROR_FAILED;
   }
 
   // Change permissions of cache file directory to u+rwx,og+x (711) in order to
   // allow archive files in that directory to be mounted by cros-disks.
   base::SetPosixFilePermissions(
       cache_root_directory.Append(kCacheFileDirectory),
       base::FILE_PERMISSION_USER_MASK |
       base::FILE_PERMISSION_EXECUTE_BY_GROUP |
       base::FILE_PERMISSION_EXECUTE_BY_OTHERS);
 
   internal::ResourceMetadataStorage::UpgradeOldDB(
-      metadata_storage->directory_path(), id_canonicalizer);
+      metadata_storage->directory_path());
 
   if (!metadata_storage->Initialize()) {
     LOG(WARNING) << "Failed to initialize the metadata storage.";
     return FILE_ERROR_FAILED;
   }
 
   if (!cache->Initialize()) {
     LOG(WARNING) << "Failed to initialize the cache.";
     return FILE_ERROR_FAILED;
   }
@@ skipping 336 matching lines @@
   state_ = INITIALIZING;
 
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&InitializeMetadata,
                  cache_root_directory_,
                  metadata_storage_.get(),
                  cache_.get(),
                  resource_metadata_.get(),
-                 drive_service_->GetResourceIdCanonicalizer(),
                  file_manager::util::GetDownloadsFolderForProfile(profile_)),
       base::Bind(&DriveIntegrationService::InitializeAfterMetadataInitialized,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DriveIntegrationService::InitializeAfterMetadataInitialized(
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(INITIALIZING, state_);
 
@@ skipping 149 matching lines @@
         profile, preference_watcher,
         NULL, std::string(), base::FilePath(), NULL);
   } else {
     service = factory_for_test_->Run(profile);
   }
 
   return service;
 }
 
 }  // namespace drive