Remove DriveFileSystem::LoadIfNeeded().

chrome/browser/chromeos/drive/drive_file_system.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_file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
-#include "base/json/json_file_value_serializer.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/platform_file.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "base/values.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
@@ skipping 308 matching lines @@
   }
   DCHECK(entry_proto.get());
 
   CheckLocalModificationAndRun(
       entry_proto.Pass(),
       base::Bind(&RunGetEntryInfoWithFilePathCallback,
                  callback,
                  file_path));
 }
 
-void DriveFileSystem::LoadIfNeeded(
-    const DirectoryFetchInfo& directory_fetch_info,
-    const FileOperationCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!callback.is_null());
-
-  change_list_loader_->LoadIfNeeded(directory_fetch_info, callback);
-}
-
 void DriveFileSystem::TransferFileFromRemoteToLocal(
     const base::FilePath& remote_src_file_path,
     const base::FilePath& local_dest_file_path,
     const FileOperationCallback& callback) {
 
   drive_operations_.TransferFileFromRemoteToLocal(remote_src_file_path,
                                                   local_dest_file_path,
                                                   callback);
 }
 
@@ skipping 267 matching lines @@
   DCHECK(!callback.is_null());
 
   if (error == DRIVE_FILE_OK) {
     CheckLocalModificationAndRun(entry_proto.Pass(), callback);
     return;
   }
 
   // Start loading if needed. Note that directory_fetch_info is empty here,
   // as we don't need to fetch the contents of a directory when we just need
   // to get an entry of the directory.
-  LoadIfNeeded(DirectoryFetchInfo(),
-               base::Bind(&DriveFileSystem::GetEntryInfoByPathAfterLoad,
-                          weak_ptr_factory_.GetWeakPtr(),
-                          file_path,
-                          callback));
+  change_list_loader_->LoadIfNeeded(
+      DirectoryFetchInfo(),
+      base::Bind(&DriveFileSystem::GetEntryInfoByPathAfterLoad,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 file_path,
+                 callback));
 }
 
 void DriveFileSystem::GetEntryInfoByPathAfterLoad(
     const base::FilePath& file_path,
     const GetEntryInfoCallback& callback,
     DriveFileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != DRIVE_FILE_OK) {
@@ skipping 44 matching lines @@
 void DriveFileSystem::ReadDirectoryByPathAfterGetEntry(
     const base::FilePath& directory_path,
     const ReadDirectoryWithSettingCallback& callback,
     DriveFileError error,
     scoped_ptr<DriveEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != DRIVE_FILE_OK) {
     // If we don't know about the directory, start loading.
-    LoadIfNeeded(DirectoryFetchInfo(),
-                 base::Bind(&DriveFileSystem::ReadDirectoryByPathAfterLoad,
-                            weak_ptr_factory_.GetWeakPtr(),
-                            directory_path,
-                            callback));
+    change_list_loader_->LoadIfNeeded(
+        DirectoryFetchInfo(),
+        base::Bind(&DriveFileSystem::ReadDirectoryByPathAfterLoad,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   directory_path,
+                   callback));
     return;
   }
 
   if (!entry_proto->file_info().is_directory()) {
     callback.Run(DRIVE_FILE_ERROR_NOT_A_DIRECTORY,
                  hide_hosted_docs_,
                  scoped_ptr<DriveEntryProtoVector>());
     return;
   }
 
   // Pass the directory fetch info so we can fetch the contents of the
   // directory before loading change lists.
   DirectoryFetchInfo directory_fetch_info(
       entry_proto->resource_id(),
       entry_proto->directory_specific_info().changestamp());
-  LoadIfNeeded(directory_fetch_info,
-               base::Bind(&DriveFileSystem::ReadDirectoryByPathAfterLoad,
-                          weak_ptr_factory_.GetWeakPtr(),
-                          directory_path,
-                          callback));
+  change_list_loader_->LoadIfNeeded(
+      directory_fetch_info,
+      base::Bind(&DriveFileSystem::ReadDirectoryByPathAfterLoad,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 directory_path,
+                 callback));
 }
 
 void DriveFileSystem::ReadDirectoryByPathAfterLoad(
     const base::FilePath& directory_path,
     const ReadDirectoryWithSettingCallback& callback,
     DriveFileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != DRIVE_FILE_OK) {
@@ skipping 936 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   util::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   callback.Run(DRIVE_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace drive