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

chrome/browser/chromeos/file_system_provider/provided_file_system.cc

 // 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.
 
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/files/file.h"
@@ skipping 389 matching lines @@
   const ObservedEntries::const_iterator it = observed_entries_.find(entry_path);
   if (it == observed_entries_.end()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
 
   // Delete the watcher in advance since the list of observed entries is owned
   // by the C++ layer, not by the extension.
   observed_entries_.erase(it);
 
-  FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
-                    observers_,
-                    OnObservedEntryListChanged(file_system_info_));
+  FOR_EACH_OBSERVER(
+      ProvidedFileSystemObserver,
+      observers_,
+      OnObservedEntryListChanged(file_system_info_, observed_entries_));
 
   // TODO(mtomasz): Consider returning always an OK error code, since for the
   // callers it's important that the entry is not watched anymore. The watcher
   // is removed even if the extension returns an error.
   const int request_id = request_manager_->CreateRequest(
       UNOBSERVE_ENTRY,
       scoped_ptr<RequestManager::HandlerInterface>(
           new operations::UnobserveEntry(
               event_router_, file_system_info_, entry_path, callback)));
   if (!request_id)
     callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 const ProvidedFileSystemInfo& ProvidedFileSystem::GetFileSystemInfo() const {
   return file_system_info_;
 }
 
 RequestManager* ProvidedFileSystem::GetRequestManager() {
   return request_manager_.get();
 }
 
-ProvidedFileSystem::ObservedEntries* ProvidedFileSystem::GetObservedEntries() {
+ObservedEntries* ProvidedFileSystem::GetObservedEntries() {
   return &observed_entries_;
 }
 
 void ProvidedFileSystem::AddObserver(ProvidedFileSystemObserver* observer) {
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void ProvidedFileSystem::RemoveObserver(ProvidedFileSystemObserver* observer) {
   DCHECK(observer);
@@ skipping 65 matching lines @@
     const storage::AsyncFileUtil::StatusCallback& callback,
     base::File::Error result) {
   if (result != base::File::FILE_OK) {
     callback.Run(result);
     return;
   }
 
   observed_entries_[directory_path].entry_path = directory_path;
   observed_entries_[directory_path].recursive |= recursive;
 
-  FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
-                    observers_,
-                    OnObservedEntryListChanged(file_system_info_));
+  FOR_EACH_OBSERVER(
+      ProvidedFileSystemObserver,
+      observers_,
+      OnObservedEntryListChanged(file_system_info_, observed_entries_));
 
   callback.Run(result);
 }
 
 void ProvidedFileSystem::OnNotifyCompleted(
     const base::FilePath& observed_path,
     ProvidedFileSystemObserver::ChangeType change_type,
     scoped_ptr<ProvidedFileSystemObserver::ChildChanges> /* child_changes */,
     const std::string& last_tag,
     const std::string& tag) {
@@ skipping 10 matching lines @@
   // message is printed, but we may want to pass the error to the providing
   // extension. TODO(mtomasz): Consider it.
   if (!tag.empty() && tag == it->second.last_tag)
     LOG(ERROR) << "Tag specified, but same as the previous one.";
 
   it->second.last_tag = tag;
 
   FOR_EACH_OBSERVER(
       ProvidedFileSystemObserver,
       observers_,
-      OnObservedEntryTagUpdated(file_system_info_, observed_path));
+      OnObservedEntryTagUpdated(file_system_info_, observed_path, tag));
 
   // If the observed entry is deleted, then unobserve it.
   if (change_type == ProvidedFileSystemObserver::DELETED)
     UnobserveEntry(observed_path, base::Bind(&EmptyStatusCallback));
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos