drive: Replace GetResourceListCallback in DriveServiceInterface with FileListCallback

chrome/browser/drive/fake_drive_service.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_DRIVE_FAKE_DRIVE_SERVICE_H_
 #define CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_
 
 #include "base/files/file_path.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 
@@ skipping 20 matching lines @@
   FakeDriveService();
   virtual ~FakeDriveService();
 
   // Loads the app list for Drive API. Returns true on success.
   bool LoadAppListForDriveApi(const std::string& relative_path);
 
   // Changes the offline state. All functions fail with GDATA_NO_CONNECTION
   // when offline. By default the offline state is false.
   void set_offline(bool offline) { offline_ = offline; }
 
-  // GetAllResourceList never returns result when this is set to true.
+  // GetAllFileList never returns result when this is set to true.
   // Used to emulate the real server's slowness.
-  void set_never_return_all_resource_list(bool value) {
-    never_return_all_resource_list_ = value;
+  void set_never_return_all_file_list(bool value) {
+    never_return_all_file_list_ = value;
   }
 
-  // Changes the default max results returned from GetResourceList().
+  // Changes the default max results returned from GetAllFileList().
   // By default, it's set to 0, which is unlimited.
   void set_default_max_results(int default_max_results) {
     default_max_results_ = default_max_results;
   }
 
   // Sets the url to the test server to be used as a base for generated share
   // urls to the share dialog.
   void set_share_url_base(const GURL& share_url_base) {
     share_url_base_ = share_url_base;
   }
 
   // Changes the quota fields returned from GetAboutResource().
   void SetQuotaValue(int64 used, int64 total);
 
   // Returns the AboutResource.
   const google_apis::AboutResource& about_resource() const {
     return *about_resource_;
   }
 
-  // Returns the number of times the resource list is successfully loaded by
-  // GetAllResourceList().
-  int resource_list_load_count() const { return resource_list_load_count_; }
+  // Returns the number of times the file list is successfully loaded by
+  // GetAllFileList().
+  int file_list_load_count() const { return file_list_load_count_; }
 
   // Returns the number of times the resource list is successfully loaded by
   // GetChangeList().
   int change_list_load_count() const { return change_list_load_count_; }
 
   // Returns the number of times the resource list is successfully loaded by
-  // GetResourceListInDirectory().
+  // GetFileListInDirectory().
   int directory_load_count() const { return directory_load_count_; }
 
   // Returns the number of times the about resource is successfully loaded
   // by GetAboutResource().
   int about_resource_load_count() const {
     return about_resource_load_count_;
   }
 
   // Returns the number of times the app list is successfully loaded by
   // GetAppList().
   int app_list_load_count() const { return app_list_load_count_; }
 
-  // Returns the number of times GetAllResourceList are blocked due to
-  // set_never_return_all_resource_list().
-  int blocked_resource_list_load_count() const {
-    return blocked_resource_list_load_count_;
+  // Returns the number of times GetAllFileList are blocked due to
+  // set_never_return_all_file_list().
+  int blocked_file_list_load_count() const {
+    return blocked_file_list_load_count_;
   }
 
   // Returns the file path whose request is cancelled just before this method
   // invocation.
   const base::FilePath& last_cancelled_file() const {
     return last_cancelled_file_;
   }
 
   // Returns the (fake) URL for the link.
   static GURL GetFakeLinkUrl(const std::string& resource_id);
 
   // DriveServiceInterface Overrides
   virtual void Initialize(const std::string& account_id) OVERRIDE;
   virtual void AddObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual bool CanSendRequest() const OVERRIDE;
   virtual ResourceIdCanonicalizer GetResourceIdCanonicalizer() const OVERRIDE;
   virtual std::string GetRootResourceId() const OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual void RequestAccessToken(
       const google_apis::AuthStatusCallback& callback) OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
   virtual void ClearAccessToken() OVERRIDE;
   virtual void ClearRefreshToken() OVERRIDE;
-  virtual google_apis::CancelCallback GetAllResourceList(
-      const google_apis::GetResourceListCallback& callback) OVERRIDE;
-  virtual google_apis::CancelCallback GetResourceListInDirectory(
+  virtual google_apis::CancelCallback GetAllFileList(
+      const google_apis::FileListCallback& callback) OVERRIDE;
+  virtual google_apis::CancelCallback GetFileListInDirectory(
       const std::string& directory_resource_id,
-      const google_apis::GetResourceListCallback& callback) OVERRIDE;
+      const google_apis::FileListCallback& callback) OVERRIDE;
   // See the comment for EntryMatchWidthQuery() in .cc file for details about
   // the supported search query types.
   virtual google_apis::CancelCallback Search(
       const std::string& search_query,
-      const google_apis::GetResourceListCallback& callback) OVERRIDE;
+      const google_apis::FileListCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback SearchByTitle(
       const std::string& title,
       const std::string& directory_resource_id,
-      const google_apis::GetResourceListCallback& callback) OVERRIDE;
+      const google_apis::FileListCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetChangeList(
       int64 start_changestamp,
       const google_apis::ChangeListCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetRemainingChangeList(
       const GURL& next_link,
       const google_apis::ChangeListCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetRemainingFileList(
       const GURL& next_link,
-      const google_apis::GetResourceListCallback& callback) OVERRIDE;
+      const google_apis::FileListCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetResourceEntry(
       const std::string& resource_id,
       const google_apis::GetResourceEntryCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetShareUrl(
       const std::string& resource_id,
       const GURL& embed_origin,
       const google_apis::GetShareUrlCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetAboutResource(
       const google_apis::AboutResourceCallback& callback) OVERRIDE;
   virtual google_apis::CancelCallback GetAppList(
@@ skipping 142 matching lines @@
   // |resource_id| can be empty, in the case, the id is automatically generated.
   // Returns a pointer to the newly added entry, or NULL if failed.
   const EntryInfo* AddNewEntry(
       const std::string& resource_id,
       const std::string& content_type,
       const std::string& content_data,
       const std::string& parent_resource_id,
       const std::string& title,
       bool shared_with_me);
 
-  // Core implementation of GetResourceList.
+  // Core implementation of GetChangeList.
   // This method returns the slice of the all matched entries, and its range
   // is between |start_offset| (inclusive) and |start_offset| + |max_results|
   // (exclusive).
   // Increments *load_counter by 1 before it returns successfully.
-  void GetResourceListInternal(
+  void GetChangeListInternal(
       int64 start_changestamp,
       const std::string& search_query,
       const std::string& directory_resource_id,
       int start_offset,
       int max_results,
       int* load_counter,
       const google_apis::ChangeListCallback& callback);
 
   // Returns new upload session URL.
   GURL GetNewUploadSessionUrl();
 
   typedef std::map<std::string, EntryInfo*> EntryInfoMap;
   EntryInfoMap entries_;
   scoped_ptr<google_apis::AboutResource> about_resource_;
   scoped_ptr<base::DictionaryValue> app_info_value_;
   std::map<GURL, UploadSession> upload_sessions_;
   int64 published_date_seq_;
   int64 next_upload_sequence_number_;
   int default_max_results_;
   int resource_id_count_;
-  int resource_list_load_count_;
+  int file_list_load_count_;
   int change_list_load_count_;
   int directory_load_count_;
   int about_resource_load_count_;
   int app_list_load_count_;
-  int blocked_resource_list_load_count_;
+  int blocked_file_list_load_count_;
   bool offline_;
-  bool never_return_all_resource_list_;
+  bool never_return_all_file_list_;
   base::FilePath last_cancelled_file_;
   GURL share_url_base_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeDriveService);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_