[fsp] Unmount file systems when the providing extension gets unloaded.

chrome/browser/chromeos/file_system_provider/service.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/service.h"
 
 #include "base/files/file_path.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/file_system_provider/observer.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
 #include "chrome/browser/chromeos/file_system_provider/service_factory.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/extension.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
 namespace chromeos {
 namespace file_system_provider {
 namespace {
 
 // Root mount path for all of the provided file systems.
 const base::FilePath::CharType kProvidedMountPointRoot[] =
     FILE_PATH_LITERAL("/provided");
 
@@ skipping 10 matching lines @@
           ? chromeos::UserManager::Get()->GetUserByProfile(
                 profile->GetOriginalProfile())
           : NULL;
   const std::string user_suffix = user ? "-" + user->username_hash() : "";
   return base::FilePath(kProvidedMountPointRoot).AppendASCII(
       extension_id + "-" + base::IntToString(file_system_id) + user_suffix);
 }
 
 }  // namespace
 
-Service::Service(Profile* profile)
-    : profile_(profile), next_id_(1), weak_ptr_factory_(this) {
+Service::Service(Profile* profile,
+                 extensions::ExtensionRegistry* extension_registry)
+    : profile_(profile),
+      extension_registry_(extension_registry),
+      next_id_(1),
+      weak_ptr_factory_(this) {
   AddObserver(&request_manager_);
+  extension_registry_->AddObserver(this);
 }
 
 Service::~Service() { STLDeleteValues(&file_system_map_); }
 
 // static
 Service* Service::Get(content::BrowserContext* context) {
   return ServiceFactory::Get(context);
 }
 
 void Service::AddObserver(Observer* observer) {
@@ skipping 156 matching lines @@
       file_system_map_.find(file_system_id);
   if (file_system_it == file_system_map_.end() ||
       file_system_it->second->GetFileSystemInfo().extension_id() !=
           extension_id) {
     return NULL;
   }
 
   return file_system_it->second;
 }
 
-void Service::Shutdown() { RemoveObserver(&request_manager_); }
+void Service::Shutdown() {
+  RemoveObserver(&request_manager_);
+  extension_registry_->RemoveObserver(this);
+}
+
+void Service::OnExtensionUnloaded(const extensions::Extension* extension) {
+  // Unmount all of the provided file systems associated with this extension.
+  ProvidedFileSystemMap::iterator it = file_system_map_.begin();
+  while (it != file_system_map_.end()) {
+    const ProvidedFileSystemInfo& file_system_info =
+        it->second->GetFileSystemInfo();
+    LOG(ERROR) << extension->id() << " vs. " << file_system_info.extension_id();

[hashimoto, 2014/03/27 09:18:49]

No need to corrupt the feedback log with this information.
Please remove this or use VLOG or DVLOG.

[mtomasz, 2014/03/28 06:01:10]

Done.

+    if (file_system_info.extension_id() == extension->id()) {
+      // Advance the iterator beforehand, otherwise it will become invalidated
+      // by the UnmountFileSystem() call.
+      ++it;
+      bool result = UnmountFileSystem(file_system_info.extension_id(),
+                                      file_system_info.file_system_id());
+      DCHECK(result);
+    } else {
+      ++it;

[hashimoto, 2014/03/27 09:18:49]

nit: How about moving this ++it to above the if-statement to avoid the code
duplication?

[mtomasz, 2014/03/28 06:01:10]

Good idea. Done.

+    }
+  }
+}
 
 void Service::OnRequestUnmountStatus(
     const ProvidedFileSystemInfo& file_system_info,
     base::File::Error error) {
   // Notify observers about failure in unmounting, since mount() will not be
   // called by the provided file system. In case of success mount() will be
   // invoked, and observers notified, so there is no need to call them now.
   if (error != base::File::FILE_OK) {
     FOR_EACH_OBSERVER(Observer,
                       observers_,
                       OnProvidedFileSystemUnmount(file_system_info, error));
   }
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos