drive: Move RefreshDirectory from ResourceMetadata to ChangeListLoader

chrome/browser/chromeos/drive/resource_metadata.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_RESOURCE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_
 
-#include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace drive {
 
-class ResourceEntry;
+typedef std::vector<ResourceEntry> ResourceEntryVector;
 
-typedef std::vector<ResourceEntry> ResourceEntryVector;
-typedef std::map<std::string /* resource_id */, ResourceEntry>
-    ResourceEntryMap;
-
-// Holds information needed to fetch contents of a directory.
-// This object is copyable.
-class DirectoryFetchInfo {
- public:
-  DirectoryFetchInfo() : changestamp_(0) {}
-  DirectoryFetchInfo(const std::string& resource_id,
-                     int64 changestamp)
-      : resource_id_(resource_id),
-        changestamp_(changestamp) {
-  }
-
-  // Returns true if the object is empty.
-  bool empty() const { return resource_id_.empty(); }
-
-  // Resource ID of the directory.
-  const std::string& resource_id() const { return resource_id_; }
-
-  // Changestamp of the directory. The changestamp is used to determine if
-  // the directory contents should be fetched.
-  int64 changestamp() const { return changestamp_; }
-
-  // Returns a string representation of this object.
-  std::string ToString() const;
-
- private:
-  const std::string resource_id_;
-  const int64 changestamp_;
-};
 
 // Callback similar to FileOperationCallback but with a given |file_path|.
 // Used for operations that change a file path like moving files.
 typedef base::Callback<void(FileError error,
                             const base::FilePath& file_path)>
     FileMoveCallback;
 
 // Used to get a resource entry from the file system.
 // If |error| is not FILE_ERROR_OK, |entry_info| is set to NULL.
 typedef base::Callback<void(FileError error,
@@ skipping 139 matching lines @@
   // entry of |second_path|. |callback| must not be null.
   // Must be called on the UI thread.
   void GetResourceEntryPairByPathsOnUIThread(
       const base::FilePath& first_path,
       const base::FilePath& second_path,
       const GetResourceEntryPairCallback& callback);
 
   // Replaces an existing entry whose ID is |entry.resource_id()| with |entry|.
   FileError RefreshEntry(const ResourceEntry& entry);
 
-  // Updates the changestamp of a directory according to |directory_fetch_info|,
-  // and adds or refreshes the child entries from |entry_map|.
-  // |callback| is called with the directory path. |callback| must not be null.
-  // Must be called on the UI thread.
-  void RefreshDirectoryOnUIThread(
-      const DirectoryFetchInfo& directory_fetch_info,
-      const ResourceEntryMap& entry_map,
-      const FileMoveCallback& callback);
-
   // Recursively get child directories of entry pointed to by |resource_id|.
   void GetChildDirectories(const std::string& resource_id,
                            std::set<base::FilePath>* child_directories);
 
   // Returns the resource id of the resource named |base_name| directly under
   // the directory with |parent_local_id|.
   // If not found, empty string will be returned.
   std::string GetChildResourceId(const std::string& parent_local_id,
                                  const std::string& base_name);
 
@@ skipping 16 matching lines @@
   // Used to implement MoveEntryToDirectoryOnUIThread().
   FileError MoveEntryToDirectory(const base::FilePath& file_path,
                                  const base::FilePath& directory_path,
                                  base::FilePath* out_file_path);
 
   // Used to implement RenameEntryOnUIThread().
   FileError RenameEntry(const base::FilePath& file_path,
                         const std::string& new_name,
                         base::FilePath* out_file_path);
 
-  // Used to implement RefreshDirectoryOnUIThread().
-  FileError RefreshDirectory(const DirectoryFetchInfo& directory_fetch_info,
-                             const ResourceEntryMap& entry_map,
-                             base::FilePath* out_file_path);
-
   // Continues with GetResourceEntryPairByPathsOnUIThread after the first
   // entry has been asynchronously fetched. This fetches the second entry
   // only if the first was found.
   void GetResourceEntryPairByPathsOnUIThreadAfterGetFirst(
       const base::FilePath& first_path,
       const base::FilePath& second_path,
       const GetResourceEntryPairCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntry> entry);
 
@@ skipping 27 matching lines @@
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<ResourceMetadata> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceMetadata);
 };
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_RESOURCE_METADATA_H_