[PPAPI] Fixed FileSystems from JavaScript not having a context.

content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc

 // Copyright 2013 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 "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 47 matching lines @@
                                                          PP_FileSystemType type)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       browser_ppapi_host_(host),
       type_(type),
       opened_(false),
       fs_context_(NULL),
       called_open_(false),
       weak_factory_(this) {
 }
 
-PepperFileSystemBrowserHost::PepperFileSystemBrowserHost(BrowserPpapiHost* host,
-                                                         PP_Instance instance,
-                                                         PP_Resource resource,
-                                                         const GURL& root_url,
-                                                         PP_FileSystemType type)
-    : ResourceHost(host->GetPpapiHost(), instance, resource),
-      browser_ppapi_host_(host),
-      type_(type),
-      opened_(true),
-      root_url_(root_url),
-      fs_context_(NULL),
-      called_open_(true),
-      weak_factory_(this) {
+void PepperFileSystemBrowserHost::OpenExisting(const GURL& root_url,
+                                               base::Closure callback) {
+  root_url_ = root_url;
+  int render_process_id = 0;
+  int unused;
+  if (!browser_ppapi_host_->GetRenderViewIDsForInstance(
+           pp_instance(), &render_process_id, &unused)) {
+    NOTREACHED();
+  }
+  called_open_ = true;
+  // Get the file system context asynchronously, and then complete the Open
+  // operation by calling |callback|.
+  BrowserThread::PostTaskAndReplyWithResult(
+      BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&GetFileSystemContextFromRenderId, render_process_id),
+      base::Bind(&PepperFileSystemBrowserHost::OpenExistingHaveContext,
+                 weak_factory_.GetWeakPtr(), callback));
 }
 
 PepperFileSystemBrowserHost::~PepperFileSystemBrowserHost() {
   // TODO(teravest): Create a FileSystemOperationRunner
   // per-PepperFileSystemBrowserHost, force users of this FileSystem to use it,
   // and call Shutdown() on it here.
 }
 
 int32_t PepperFileSystemBrowserHost::OnResourceMessageReceived(
     const IPC::Message& msg,
@@ skipping 50 matching lines @@
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&GetFileSystemContextFromRenderId, render_process_id),
       base::Bind(&PepperFileSystemBrowserHost::GotFileSystemContext,
                  weak_factory_.GetWeakPtr(),
                  context->MakeReplyMessageContext(),
                  file_system_type));
   return PP_OK_COMPLETIONPENDING;
 }
 
+void PepperFileSystemBrowserHost::OpenExistingHaveContext(
+    base::Closure callback,
+    scoped_refptr<fileapi::FileSystemContext> fs_context) {
+  opened_ = true;

[yzshen1, 2013/11/01 22:27:39]

Is it intended to set it to true even if fs_context is NULL?

[Matt Giuca, 2013/11/01 23:19:47]

Good point. I changed it so that opened_ is only true if fs_context is non-NULL.

+  // If there is no file system context, we log a warning and continue with an
+  // invalid resource (which will produce errors when used), since we have no
+  // way to communicate the error to the caller.
+  if (!fs_context.get())
+    LOG(WARNING) << "Could not retrieve file system context.";
+  fs_context_ = fs_context;
+  callback.Run();
+}
+
 void PepperFileSystemBrowserHost::GotFileSystemContext(
     ppapi::host::ReplyMessageContext reply_context,
     fileapi::FileSystemType file_system_type,
     scoped_refptr<fileapi::FileSystemContext> fs_context) {
   if (!fs_context.get()) {
     OpenFileSystemComplete(
         reply_context, GURL(), std::string(), base::PLATFORM_FILE_ERROR_FAILED);
     return;
   }
   GURL origin = browser_ppapi_host_->GetDocumentURLForInstance(
@@ skipping 59 matching lines @@
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&GetFileSystemContextFromRenderId, render_process_id),
       base::Bind(&PepperFileSystemBrowserHost::GotIsolatedFileSystemContext,
                  weak_factory_.GetWeakPtr(),
                  context->MakeReplyMessageContext()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace content