[fsp] Extract ObservedEntry and ObservedEntries to a separate file.

chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h

 // Copyright 2014 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_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/chromeos/file_system_provider/observed_entry.h"

[fukino, 2014/10/17 04:51:02]

nit: unneeded header?

[mtomasz, 2014/10/17 05:29:43]

ObservedEntry was previously declared in the same file, now it's moved away, so
we need an include. See #204.

 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_observer.h"
 #include "storage/browser/fileapi/async_file_util.h"
 
 class EventRouter;
 
 namespace base {
 class Time;
 }  // namespace base
 
 namespace net {
@@ skipping 22 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EntryMetadata);
 };
 
 // Interface for a provided file system. Acts as a proxy between providers
 // and clients. All of the request methods return an abort callback in order to
 // terminate it while running. They must be called on the same thread as the
 // request methods. The cancellation callback may be null if the operation
 // fails synchronously.
 class ProvidedFileSystemInterface {
  public:
-  struct ObservedEntry;
   struct ChildChange;
 
   // Mode of opening a file. Used by OpenFile().
   enum OpenFileMode { OPEN_FILE_MODE_READ, OPEN_FILE_MODE_WRITE };
 
   // Extra fields to be fetched with metadata.
   enum MetadataField {
     METADATA_FIELD_DEFAULT = 0,
     METADATA_FIELD_THUMBNAIL = 1 << 0
   };
 
   typedef base::Callback<void(int file_handle, base::File::Error result)>
       OpenFileCallback;
 
   typedef base::Callback<
       void(int chunk_length, bool has_more, base::File::Error result)>
       ReadChunkReceivedCallback;
 
   typedef base::Callback<void(scoped_ptr<EntryMetadata> entry_metadata,
                               base::File::Error result)> GetMetadataCallback;
 
   typedef base::Callback<void(
       const storage::AsyncFileUtil::StatusCallback& callback)> AbortCallback;
 
   // Mask of fields requested from the GetMetadata() call.
   typedef int MetadataFieldMask;
 
-  // List of observed entries.
-  typedef std::map<base::FilePath, ObservedEntry> ObservedEntries;
-
-  // Represents an observed entry on the file system.
-  struct ObservedEntry {
-    ObservedEntry();
-    ~ObservedEntry();
-
-    base::FilePath entry_path;
-    bool recursive;
-    std::string last_tag;
-  };
-
   virtual ~ProvidedFileSystemInterface() {}
 
   // Requests unmounting of the file system. The callback is called when the
   // request is accepted or rejected, with an error code.
   virtual AbortCallback RequestUnmount(
       const storage::AsyncFileUtil::StatusCallback& callback) = 0;
 
   // Requests metadata of the passed |entry_path|. It can be either a file
   // or a directory. All |fields| will be returned if supported. Note, that
   // default fields are always returned.
@@ skipping 115 matching lines @@
   virtual void RemoveObserver(ProvidedFileSystemObserver* observer) = 0;
 
   // Returns a weak pointer to this object.
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() = 0;
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_