drive: Remove FileCacheObserver::OnCacheCommitted

chrome/browser/chromeos/drive/file_system.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_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 145 matching lines @@
       const FileOperationCallback& callback) OVERRIDE;
   virtual void GetCacheEntryByResourceId(
       const std::string& resource_id,
       const std::string& md5,
       const GetCacheEntryCallback& callback) OVERRIDE;
   virtual void Reload() OVERRIDE;
 
   // file_system::OperationObserver overrides.
   virtual void OnDirectoryChangedByOperation(
       const base::FilePath& directory_path) OVERRIDE;
+  virtual void OnCacheFileUploadNeededByOperation(
+      const std::string& resource_id) OVERRIDE;
 
   // ChangeListLoader::Observer overrides.
   // Used to propagate events from ChangeListLoader.
   virtual void OnDirectoryChanged(
       const base::FilePath& directory_path) OVERRIDE;
   virtual void OnLoadFromServerComplete() OVERRIDE;
   virtual void OnInitialLoadComplete() OVERRIDE;
 
   // Used in tests to update the file system using the change list loader.
   internal::ChangeListLoader* change_list_loader() {
     return change_list_loader_.get();
   }
 
  private:
-  friend class DriveFileSystemTest;
+  friend class FileSystemTest;

[kinaba, 2013/06/11 07:08:37]

Good catch. Do we need this friend declaration at all,
if it compiles with the wrong name?

Ah, got it. It's for accessing |sync_client_|.
Rather than making it a friend, I think adding a public method
sync_client_for_testing() looks cleaner. (change_list_loader() actually
falls into the same category.) WDYT?

[hashimoto, 2013/06/11 07:37:57]

Sounds good, done.
Maybe we should make a patch to rename change_list_loader() to
change_list_loader_for_testing() too.

 
   // Used to implement Reload().
   void ReloadAfterReset(FileError error);
 
   // Sets up ChangeListLoader.
   void SetupChangeListLoader();
 
   // Called on preference change.
   void OnDisableDriveHostedFilesChanged();
 
@@ skipping 41 matching lines @@
   // Invoked during the process of CloseFile. What is done here is as follows:
   // 1) Gets resource_id and md5 of the entry at |file_path|.
   // 2) Commits the modification to the cache system.
   // 3) Removes the |file_path| from the remembered set of opened files.
   // 4) Invokes the user-supplied |callback|.
   // |callback| must not be null.
   void CloseFileAfterGetResourceEntry(const base::FilePath& file_path,
                                       const FileOperationCallback& callback,
                                       FileError error,
                                       scoped_ptr<ResourceEntry> entry);
-  void CloseFileFinalize(const base::FilePath& file_path,
-                         const FileOperationCallback& callback,
-                         FileError result);
 
   // Callback for handling about resource fetch.
   void OnGetAboutResource(
       const GetAvailableSpaceCallback& callback,
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Part of CheckForUpdates(). Called when
   // ChangeListLoader::CheckForUpdates() is complete.
   void OnUpdateChecked(FileError error);
@@ skipping 140 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FileSystem> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_