[fsp] Refactor handling operations.

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 "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
 #include "chrome/browser/chromeos/file_system_provider/observer.h"
@@ skipping 29 matching lines @@
                  extensions::ExtensionRegistry* extension_registry)
     : profile_(profile),
       extension_registry_(extension_registry),
       file_system_factory_(base::Bind(CreateProvidedFileSystem)),
       next_id_(1),
       weak_ptr_factory_(this) {
   extension_registry_->AddObserver(this);
 }
 
 Service::~Service() {
+  extension_registry_->RemoveObserver(this);
+
   ProvidedFileSystemMap::iterator it = file_system_map_.begin();
   while (it != file_system_map_.end()) {
     const int file_system_id = it->first;
     const std::string extension_id =
         it->second->GetFileSystemInfo().extension_id();
     ++it;
     UnmountFileSystem(extension_id, file_system_id);
   }
 
   DCHECK_EQ(0u, file_system_map_.size());
@@ skipping 137 matching lines @@
 }
 
 bool Service::RequestUnmount(int file_system_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   ProvidedFileSystemMap::iterator file_system_it =
       file_system_map_.find(file_system_id);
   if (file_system_it == file_system_map_.end())
     return false;
 
-  return file_system_it->second->RequestUnmount(
+  file_system_it->second->RequestUnmount(
       base::Bind(&Service::OnRequestUnmountStatus,
                  weak_ptr_factory_.GetWeakPtr(),
                  file_system_it->second->GetFileSystemInfo()));
+  return true;
 }
 
 std::vector<ProvidedFileSystemInfo> Service::GetProvidedFileSystemInfoList() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   std::vector<ProvidedFileSystemInfo> result;
   for (ProvidedFileSystemMap::const_iterator it = file_system_map_.begin();
        it != file_system_map_.end();
        ++it) {
     result.push_back(it->second->GetFileSystemInfo());
@@ skipping 62 matching lines @@
   // 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