[fsp] Create a RequestManager per a ProvidedFileSystem instance.

chrome/browser/chromeos/file_system_provider/service.cc

Index: chrome/browser/chromeos/file_system_provider/service.cc
diff --git a/chrome/browser/chromeos/file_system_provider/service.cc b/chrome/browser/chromeos/file_system_provider/service.cc
index 5348b34712a5e165057dc6871014dd0cdd9fb4eb..92f8cce7431f565dc7a21eae54aa30d112ec8cc2 100644
--- a/chrome/browser/chromeos/file_system_provider/service.cc
+++ b/chrome/browser/chromeos/file_system_provider/service.cc
@@ -23,16 +23,13 @@ namespace {
 // Maximum number of file systems to be mounted in the same time, per profile.
 const size_t kMaxFileSystems = 16;
 
-// Default factory for provided file systems. The |event_router| nor the
-// |request_manager| arguments must not be NULL.
+// Default factory for provided file systems. The |event_router| must not be
+// NULL.
 ProvidedFileSystemInterface* CreateProvidedFileSystem(
     extensions::EventRouter* event_router,
-    RequestManager* request_manager,
     const ProvidedFileSystemInfo& file_system_info) {
   DCHECK(event_router);
-  DCHECK(request_manager);
-  return new ProvidedFileSystem(
-      event_router, request_manager, file_system_info);
+  return new ProvidedFileSystem(event_router, file_system_info);
 }
 
 }  // namespace
@@ -41,11 +38,9 @@ Service::Service(Profile* profile)
     : profile_(profile),
       file_system_factory_(base::Bind(CreateProvidedFileSystem)),
       next_id_(1),
-      weak_ptr_factory_(this) {
-  AddObserver(&request_manager_);
-}
+      weak_ptr_factory_(this) {}
 
-Service::~Service() { STLDeleteValues(&file_system_map_); }
+Service::~Service() {}

[hashimoto, 2014/04/16 04:14:13]

Does this mean file_system_map_ will leak if Shutdown() was not called
correctly?
How about deleting values here too or having DCHECK(file_system_map_.empty())?

[mtomasz, 2014/04/16 05:08:10]

That's a good point. In tests, it would leak. I think we can safely move it to
the destructor. It calls ~RequestManager, which aborts requests. Aborting only
calls the error callback, which should be safe. Done.

 
 // static
 Service* Service::Get(content::BrowserContext* context) {
@@ -121,8 +116,8 @@ int Service::MountFileSystem(const std::string& extension_id,
   extensions::EventRouter* event_router =
       extensions::ExtensionSystem::Get(profile_)->event_router();
 
-  ProvidedFileSystemInterface* file_system = file_system_factory_.Run(
-      event_router, &request_manager_, file_system_info);
+  ProvidedFileSystemInterface* file_system =
+      file_system_factory_.Run(event_router, file_system_info);
   DCHECK(file_system);
   file_system_map_[file_system_id] = file_system;
 
@@ -223,7 +218,7 @@ ProvidedFileSystemInterface* Service::GetProvidedFileSystem(
   return file_system_it->second;
 }
 
-void Service::Shutdown() { RemoveObserver(&request_manager_); }
+void Service::Shutdown() { STLDeleteValues(&file_system_map_); }
 
 void Service::OnRequestUnmountStatus(
     const ProvidedFileSystemInfo& file_system_info,