Fix more incorrect usage of BrowserContext on the FILE thread.

chrome/browser/chromeos/extensions/file_handler_util.cc

 // Copyright (c) 2012 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/extensions/file_handler_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/json/json_writer.h"
@@ skipping 362 matching lines @@
 
     GURL target_file_url;
     FilePath virtual_path;
     FilePath absolute_path;
     bool is_directory;
   };
 
   typedef std::vector<FileDefinition> FileDefinitionList;
   class ExecuteTasksFileSystemCallbackDispatcher;
   void RequestFileEntryOnFileThread(
+      scoped_refptr<fileapi::FileSystemContext> file_system_context,
       const GURL& handler_base_url,
       const scoped_refptr<const extensions::Extension>& handler,
       int handler_pid,
       const std::vector<GURL>& file_urls);
 
   void ExecuteDoneOnUIThread(bool success);
   void ExecuteFileActionsOnUIThread(const std::string& file_system_name,
                                     const GURL& file_system_root,
                                     const FileDefinitionList& file_list,
                                     int handler_pid);
@@ skipping 74 matching lines @@
 ExtensionTaskExecutor::FileDefinition::FileDefinition() : is_directory(false) {
 }
 
 ExtensionTaskExecutor::FileDefinition::~FileDefinition() {
 }
 
 class ExtensionTaskExecutor::ExecuteTasksFileSystemCallbackDispatcher {
  public:
   static fileapi::FileSystemContext::OpenFileSystemCallback CreateCallback(
       ExtensionTaskExecutor* executor,
-      Profile* profile,
+      scoped_refptr<fileapi::FileSystemContext> file_system_context,
       const GURL& source_url,
       scoped_refptr<const Extension> handler_extension,
       int handler_pid,
       const std::string& action_id,
       const std::vector<GURL>& file_urls) {
     return base::Bind(
         &ExecuteTasksFileSystemCallbackDispatcher::DidOpenFileSystem,
         base::Owned(new ExecuteTasksFileSystemCallbackDispatcher(
-            executor, profile, source_url, handler_extension,
+            executor, file_system_context, source_url, handler_extension,
             handler_pid, action_id, file_urls)));
   }
 
   void DidOpenFileSystem(base::PlatformFileError result,
                          const std::string& file_system_name,
                          const GURL& file_system_root) {
     if (result != base::PLATFORM_FILE_OK) {
       DidFail(result);
       return;
     }
@@ skipping 35 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ExtensionTaskExecutor::ExecuteDoneOnUIThread,
             executor_,
             false));
   }
 
  private:
   ExecuteTasksFileSystemCallbackDispatcher(
       ExtensionTaskExecutor* executor,
-      Profile* profile,
+      scoped_refptr<fileapi::FileSystemContext> file_system_context,
       const GURL& source_url,
       const scoped_refptr<const Extension>& handler_extension,
       int handler_pid,
       const std::string& action_id,
       const std::vector<GURL>& file_urls)
       : executor_(executor),
-        profile_(profile),
+        file_system_context_(file_system_context),
         source_url_(source_url),
         handler_extension_(handler_extension),
         handler_pid_(handler_pid),
         action_id_(action_id),
         origin_file_urls_(file_urls) {
     DCHECK(executor_);
   }
 
   // Checks legitimacy of file url and grants file RO access permissions from
   // handler (target) extension and its renderer process.
@@ skipping 10 matching lines @@
     fileapi::FileSystemType type;
     if (!CrackFileSystemURL(origin_file_url, &file_origin_url, &type,
                             &virtual_path)) {
       return false;
     }
 
     if (type != fileapi::kFileSystemTypeExternal)
       return false;
 
     fileapi::ExternalFileSystemMountPointProvider* external_provider =
-        BrowserContext::GetFileSystemContext(profile_)->external_provider();
+        file_system_context_->external_provider();
     if (!external_provider)
       return false;
 
     if (!external_provider->IsAccessAllowed(file_origin_url,
                                             type,
                                             virtual_path)) {
       return false;
     }
 
     // Make sure this url really being used by the right caller extension.
@@ skipping 37 matching lines @@
     GURL base_url = fileapi::GetFileSystemRootURI(target_origin_url,
         fileapi::kFileSystemTypeExternal);
     file->target_file_url = GURL(base_url.spec() + virtual_path.value());
     file->virtual_path = virtual_path;
     file->is_directory = file_info.is_directory;
     file->absolute_path = final_file_path;
     return true;
   }
 
   ExtensionTaskExecutor* executor_;
-  Profile* profile_;
+  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   // Extension source URL.
   GURL source_url_;
   scoped_refptr<const Extension> handler_extension_;
   int handler_pid_;
   std::string action_id_;
   std::vector<GURL> origin_file_urls_;
   DISALLOW_COPY_AND_ASSIGN(ExecuteTasksFileSystemCallbackDispatcher);
 };
 
 ExtensionTaskExecutor::ExtensionTaskExecutor(
@@ skipping 24 matching lines @@
 
   int handler_pid = ExtractProcessFromExtensionId(handler->id(), profile());
   if (handler_pid <= 0) {
     if (!handler->has_lazy_background_page())
       return false;
   }
 
   done_ = done;
 
   // Get local file system instance on file thread.
+  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+      BrowserContext::GetFileSystemContext(profile());
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &ExtensionTaskExecutor::RequestFileEntryOnFileThread,
           this,
+          file_system_context,
           Extension::GetBaseURLFromExtensionId(handler->id()),
           handler,
           handler_pid,
           file_urls));
   return true;
 }
 
 void ExtensionTaskExecutor::RequestFileEntryOnFileThread(
+    scoped_refptr<fileapi::FileSystemContext> file_system_context,
     const GURL& handler_base_url,
     const scoped_refptr<const Extension>& handler,
     int handler_pid,
     const std::vector<GURL>& file_urls) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   GURL origin_url = handler_base_url.GetOrigin();
-  BrowserContext::GetFileSystemContext(profile())->OpenFileSystem(
+  file_system_context->OpenFileSystem(
       origin_url, fileapi::kFileSystemTypeExternal, false, // create
       ExecuteTasksFileSystemCallbackDispatcher::CreateCallback(
           this,
-          profile(),
+          file_system_context,
           source_url_,
           handler,
           handler_pid,
           action_id_,
           file_urls));
 }
 
 void ExtensionTaskExecutor::ExecuteDoneOnUIThread(bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!done_.is_null())
@@ skipping 168 matching lines @@
         handler_host_permissions_[i].first,
         handler_host_permissions_[i].second);
   }
 
   // We don't need this anymore.
   handler_host_permissions_.clear();
 }
 
 } // namespace file_handler_util