Fix more incorrect usage of BrowserContext on the FILE thread.

chrome/browser/chromeos/extensions/file_browser_private_api.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_browser_private_api.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 336 matching lines @@
     result_list->Append(task);
   }
 }
 
 }  // namespace
 
 class RequestLocalFileSystemFunction::LocalFileSystemCallbackDispatcher {
  public:
   static fileapi::FileSystemContext::OpenFileSystemCallback CreateCallback(
       RequestLocalFileSystemFunction* function,
-      Profile* profile,
+      scoped_refptr<fileapi::FileSystemContext> file_system_context,
       int child_id,
       scoped_refptr<const Extension> extension) {
     return base::Bind(
         &LocalFileSystemCallbackDispatcher::DidOpenFileSystem,
         base::Owned(new LocalFileSystemCallbackDispatcher(
-            function, profile, child_id, extension)));
+            function, file_system_context, child_id, extension)));
   }
 
   void DidOpenFileSystem(base::PlatformFileError result,
                          const std::string& name,
                          const GURL& root_path) {
     if (result != base::PLATFORM_FILE_OK) {
       DidFail(result);
       return;
     }
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 17 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &RequestLocalFileSystemFunction::RespondFailedOnUIThread,
             function_,
             error_code));
   }
 
  private:
   LocalFileSystemCallbackDispatcher(
       RequestLocalFileSystemFunction* function,
-      Profile* profile,
+      scoped_refptr<fileapi::FileSystemContext> file_system_context,
       int child_id,
       scoped_refptr<const Extension> extension)
       : function_(function),
-        profile_(profile),
+        file_system_context_(file_system_context),
         child_id_(child_id),
         extension_(extension)  {
     DCHECK(function_);
   }
 
   // Grants file system access permissions to file browser component.
   bool SetupFileSystemAccessPermissions() {
     if (!extension_.get())
       return false;
 
     // Make sure that only component extension can access the entire
     // local file system.
     if (extension_->location() != Extension::COMPONENT) {
       NOTREACHED() << "Private method access by non-component extension "
                    << extension_->id();
       return false;
     }
 
     fileapi::ExternalFileSystemMountPointProvider* provider =
-        BrowserContext::GetFileSystemContext(profile_)->external_provider();
+        file_system_context_->external_provider();
     if (!provider)
       return false;
 
     // Grant full access to File API from this component extension.
     provider->GrantFullAccessToExtension(extension_->id());
 
     // Grant R/W file permissions to the renderer hosting component
     // extension for all paths exposed by our local file system provider.
     std::vector<FilePath> root_dirs = provider->GetRootDirectories();
     for (std::vector<FilePath>::iterator iter = root_dirs.begin();
          iter != root_dirs.end();
          ++iter) {
       ChildProcessSecurityPolicy::GetInstance()->GrantPermissionsForFile(
           child_id_, *iter, file_handler_util::GetReadWritePermissions());
     }
     return true;
   }
 
   RequestLocalFileSystemFunction* function_;
-  Profile* profile_;
+  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   // Renderer process id.
   int child_id_;
   // Extension source URL.
   scoped_refptr<const Extension> extension_;
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemCallbackDispatcher);
 };
 
 void RequestLocalFileSystemFunction::RequestOnFileThread(
-    const GURL& source_url, int child_id) {
+    scoped_refptr<fileapi::FileSystemContext> file_system_context,
+    const GURL& source_url,
+    int child_id) {
   GURL origin_url = source_url.GetOrigin();
-  BrowserContext::GetFileSystemContext(profile())->OpenFileSystem(
+  file_system_context->OpenFileSystem(
       origin_url, fileapi::kFileSystemTypeExternal, false,  // create
       LocalFileSystemCallbackDispatcher::CreateCallback(
           this,
-          profile(),
+          file_system_context,
           child_id,
           GetExtension()));
 }
 
 bool RequestLocalFileSystemFunction::RunImpl() {
   if (!dispatcher() || !render_view_host() || !render_view_host()->GetProcess())
     return false;
 
+  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+      BrowserContext::GetFileSystemContext(profile_);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &RequestLocalFileSystemFunction::RequestOnFileThread,
           this,
+          file_system_context,
           source_url_,
           render_view_host()->GetProcess()->GetID()));
   // Will finish asynchronously.
   return true;
 }
 
 void RequestLocalFileSystemFunction::RespondSuccessOnUIThread(
     const std::string& name, const GURL& root_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Add gdata mount point immediately when we kick of first instance of file
@@ skipping 10 matching lines @@
 }
 
 void RequestLocalFileSystemFunction::RespondFailedOnUIThread(
     base::PlatformFileError error_code) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   error_ = base::StringPrintf(kFileError, static_cast<int>(error_code));
   SendResponse(false);
 }
 
 bool FileWatchBrowserFunctionBase::GetLocalFilePath(
+    scoped_refptr<fileapi::FileSystemContext> file_system_context,
     const GURL& file_url, FilePath* local_path, FilePath* virtual_path) {
   GURL file_origin_url;
   fileapi::FileSystemType type;
   if (!CrackFileSystemURL(file_url, &file_origin_url, &type,
                           virtual_path)) {
     return false;
   }
   if (type != fileapi::kFileSystemTypeExternal)
     return false;
 
-  FilePath root_path = BrowserContext::GetFileSystemContext(profile_)->
+  FilePath root_path = file_system_context->
       external_provider()->GetFileSystemRootPathOnFileThread(
           file_origin_url,
           fileapi::kFileSystemTypeExternal,
           *virtual_path,
           false);
   if (root_path == FilePath())
     return false;
 
   *local_path = root_path.Append(*virtual_path);
   return true;
 }
 
 void FileWatchBrowserFunctionBase::RespondOnUIThread(bool success) {
   result_.reset(Value::CreateBooleanValue(success));
   SendResponse(success);
 }
 
 bool FileWatchBrowserFunctionBase::RunImpl() {
   if (!render_view_host() || !render_view_host()->GetProcess())
     return false;
 
   // First param is url of a file to watch.
   std::string url;
   if (!args_->GetString(0, &url) || url.empty())
     return false;
 
   GURL file_watch_url(url);
+  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+      BrowserContext::GetFileSystemContext(profile_);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread,
           this,
+          file_system_context,
           FileBrowserEventRouterFactory::GetForProfile(profile_),
           file_watch_url,
           extension_id()));
 
   return true;
 }
 
 void FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread(
+    scoped_refptr<fileapi::FileSystemContext> file_system_context,
     scoped_refptr<FileBrowserEventRouter> event_router,
     const GURL& file_url, const std::string& extension_id) {
   FilePath local_path;
   FilePath virtual_path;
-  if (!GetLocalFilePath(file_url, &local_path, &virtual_path) ||
+  if (!GetLocalFilePath(
+          file_system_context, file_url, &local_path, &virtual_path) ||
       local_path == FilePath()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &FileWatchBrowserFunctionBase::RespondOnUIThread,
             this,
             false));
   }
   if (!PerformFileWatchOperation(event_router,
                                  local_path,
@@ skipping 1840 matching lines @@
   gdata::GDataSystemService* system_service =
       gdata::GDataSystemServiceFactory::GetForProfile(profile_);
   if (!system_service || !system_service->file_system())
     return false;
 
   FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string));
   system_service->file_system()->RequestDirectoryRefresh(directory_path);
 
   return true;
 }