Remove usage of ChildProcess::current() and ChildThread::current() other than on the main thread. This is needed so that single process mode will work correctly with the renderer/gpu/utility threads where we will have multiple ChildProcess objects.

While doing this, I made a few cleanups:
-FileSystemDispatcher was checking the return value of sending an async IPC, which always returns true. I removed the return value of those methods and updated the callers to not handle the case which never occurs.
-IPCWebSocketStreamHandleBridge was posting a task to send an async message which is needless

BUG=234172
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/17681004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208575 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 50 insertions, 66 deletions

diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 242ae86..80cea1b 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -147,11 +147,10 @@ bool MockPluginDelegate::AsyncOpenFile(const base::FilePath& path,
   return false;
 }
 
-bool MockPluginDelegate::AsyncOpenFileSystemURL(
+void MockPluginDelegate::AsyncOpenFileSystemURL(
     const GURL& path,
     int flags,
     const AsyncOpenFileSystemURLCallback& callback) {
-  return false;
 }
 
 bool MockPluginDelegate::IsFileSystemOpened(
@@ -172,60 +171,52 @@ GURL MockPluginDelegate::GetFileSystemRootUrl(
   return GURL();
 }
 
-bool MockPluginDelegate::MakeDirectory(
+void MockPluginDelegate::MakeDirectory(
     const GURL& path,
     bool recursive,
     const StatusCallback& callback) {
-  return false;
 }
 
-bool MockPluginDelegate::Query(
+void MockPluginDelegate::Query(
     const GURL& path,
     const MetadataCallback& success_callback,
     const StatusCallback& error_callback) {
-  return false;
 }
 
-bool MockPluginDelegate::ReadDirectoryEntries(
+void MockPluginDelegate::ReadDirectoryEntries(
     const GURL& path,
     const ReadDirectoryCallback& success_callback,
     const StatusCallback& error_callback) {
-  return false;
 }
 
-bool MockPluginDelegate::Touch(
+void MockPluginDelegate::Touch(
     const GURL& path,
     const base::Time& last_access_time,
     const base::Time& last_modified_time,
     const StatusCallback& callback) {
-  return false;
 }
 
-bool MockPluginDelegate::SetLength(
+void MockPluginDelegate::SetLength(
     const GURL& path,
     int64_t length,
     const StatusCallback& callback) {
-  return false;
 }
 
-bool MockPluginDelegate::Delete(
+void MockPluginDelegate::Delete(
     const GURL& path,
     const StatusCallback& callback) {
-  return false;
 }
 
-bool MockPluginDelegate::Rename(
+void MockPluginDelegate::Rename(
     const GURL& file_path,
     const GURL& new_file_path,
     const StatusCallback& callback) {
-  return false;
 }
 
-bool MockPluginDelegate::ReadDirectory(
+void MockPluginDelegate::ReadDirectory(
     const GURL& directory_path,
     const ReadDirectoryCallback& success_callback,
     const StatusCallback& error_callback) {
-  return false;
 }
 
 void MockPluginDelegate::QueryAvailableSpace(
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h
index f4050bd..f6e1586 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.h
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.h
@@ -68,7 +68,7 @@ class MockPluginDelegate : public PluginDelegate {
   virtual bool AsyncOpenFile(const base::FilePath& path,
                              int flags,
                              const AsyncOpenFileCallback& callback);
-  virtual bool AsyncOpenFileSystemURL(
+  virtual void AsyncOpenFileSystemURL(
       const GURL& path,
       int flags,
       const AsyncOpenFileSystemURLCallback& callback);
@@ -78,30 +78,30 @@ class MockPluginDelegate : public PluginDelegate {
                                               PP_Resource resource) const;
   virtual GURL GetFileSystemRootUrl(PP_Instance instance,
                                     PP_Resource resource) const;
-  virtual bool MakeDirectory(
+  virtual void MakeDirectory(
       const GURL& path,
       bool recursive,
       const StatusCallback& callback);
-  virtual bool Query(const GURL& path,
+  virtual void Query(const GURL& path,
                      const MetadataCallback& success_callback,
                      const StatusCallback& error_callback);
-  virtual bool ReadDirectoryEntries(
+  virtual void ReadDirectoryEntries(
       const GURL& path,
       const ReadDirectoryCallback& success_callback,
       const StatusCallback& error_callback);
-  virtual bool Touch(const GURL& path,
+  virtual void Touch(const GURL& path,
                      const base::Time& last_access_time,
                      const base::Time& last_modified_time,
                      const StatusCallback& callback);
-  virtual bool SetLength(const GURL& path,
+  virtual void SetLength(const GURL& path,
                          int64_t length,
                          const StatusCallback& callback);
-  virtual bool Delete(const GURL& path,
+  virtual void Delete(const GURL& path,
                       const StatusCallback& callback);
-  virtual bool Rename(const GURL& file_path,
+  virtual void Rename(const GURL& file_path,
                       const GURL& new_file_path,
                       const StatusCallback& callback);
-  virtual bool ReadDirectory(
+  virtual void ReadDirectory(
       const GURL& directory_path,
       const ReadDirectoryCallback& success_callback,
       const StatusCallback& error_callback);
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index 0353afb..be9ce18 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -494,7 +494,7 @@ class PluginDelegate {
             quota::QuotaLimitType quota_policy,
             const NotifyCloseFileCallback& close_file_callback)>
       AsyncOpenFileSystemURLCallback;
-  virtual bool AsyncOpenFileSystemURL(
+  virtual void AsyncOpenFileSystemURL(
       const GURL& path,
       int flags,
       const AsyncOpenFileSystemURLCallback& callback) = 0;
@@ -507,30 +507,30 @@ class PluginDelegate {
   typedef base::Callback<void(
       const base::PlatformFileInfo& file_info)> MetadataCallback;
 
-  virtual bool MakeDirectory(
+  virtual void MakeDirectory(
       const GURL& path,
       bool recursive,
       const StatusCallback& callback) = 0;
-  virtual bool Query(const GURL& path,
+  virtual void Query(const GURL& path,
                      const MetadataCallback& success_callback,
                      const StatusCallback& error_callback) = 0;
-  virtual bool ReadDirectoryEntries(
+  virtual void ReadDirectoryEntries(
       const GURL& path,
       const ReadDirectoryCallback& success_callback,
       const StatusCallback& error_callback) = 0;
-  virtual bool Touch(const GURL& path,
+  virtual void Touch(const GURL& path,
                      const base::Time& last_access_time,
                      const base::Time& last_modified_time,
                      const StatusCallback& callback) = 0;
-  virtual bool SetLength(const GURL& path,
+  virtual void SetLength(const GURL& path,
                          int64_t length,
                          const StatusCallback& callback) = 0;
-  virtual bool Delete(const GURL& path,
+  virtual void Delete(const GURL& path,
                       const StatusCallback& callback) = 0;
-  virtual bool Rename(const GURL& file_path,
+  virtual void Rename(const GURL& file_path,
                       const GURL& new_file_path,
                       const StatusCallback& callback) = 0;
-  virtual bool ReadDirectory(
+  virtual void ReadDirectory(
       const GURL& directory_path,
       const ReadDirectoryCallback& success_callback,
       const StatusCallback& error_callback) = 0;
diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
index 540c1d2..da4a562 100644
--- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
@@ -312,10 +312,9 @@ int32_t PPB_FileRef_Impl::MakeDirectory(
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
-  if (!plugin_instance->delegate()->MakeDirectory(
-          GetFileSystemURL(), PP_ToBool(make_ancestors),
-          base::Bind(&DidFinishFileOperation, callback)))
-    return PP_ERROR_FAILED;
+  plugin_instance->delegate()->MakeDirectory(
+      GetFileSystemURL(), PP_ToBool(make_ancestors),
+      base::Bind(&DidFinishFileOperation, callback));
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ -328,12 +327,11 @@ int32_t PPB_FileRef_Impl::Touch(PP_Time last_access_time,
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
-  if (!plugin_instance->delegate()->Touch(
-          GetFileSystemURL(),
-          PPTimeToTime(last_access_time),
-          PPTimeToTime(last_modified_time),
-          base::Bind(&DidFinishFileOperation, callback)))
-    return PP_ERROR_FAILED;
+  plugin_instance->delegate()->Touch(
+      GetFileSystemURL(),
+      PPTimeToTime(last_access_time),
+      PPTimeToTime(last_modified_time),
+      base::Bind(&DidFinishFileOperation, callback));
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ -344,10 +342,9 @@ int32_t PPB_FileRef_Impl::Delete(scoped_refptr<TrackedCallback> callback) {
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
-  if (!plugin_instance->delegate()->Delete(
-          GetFileSystemURL(),
-          base::Bind(&DidFinishFileOperation, callback)))
-    return PP_ERROR_FAILED;
+  plugin_instance->delegate()->Delete(
+      GetFileSystemURL(),
+      base::Bind(&DidFinishFileOperation, callback));
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ -368,10 +365,9 @@ int32_t PPB_FileRef_Impl::Rename(PP_Resource new_pp_file_ref,
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
-  if (!plugin_instance->delegate()->Rename(
-          GetFileSystemURL(), new_file_ref->GetFileSystemURL(),
-          base::Bind(&DidFinishFileOperation, callback)))
-    return PP_ERROR_FAILED;
+  plugin_instance->delegate()->Rename(
+      GetFileSystemURL(), new_file_ref->GetFileSystemURL(),
+      base::Bind(&DidFinishFileOperation, callback));
   return PP_OK_COMPLETIONPENDING;
 }
 
@@ -474,12 +470,10 @@ int32_t PPB_FileRef_Impl::QueryInHost(
 
     PP_FileSystemType file_system_type =
         delegate->GetFileSystemType(pp_instance(), file_system_);
-    if (!plugin_instance->delegate()->Query(
-            GetFileSystemURL(),
-            base::Bind(&DidReadMetadata, callback, info, file_system_type),
-            base::Bind(&DidFinishFileOperation, callback)))
-      return PP_ERROR_FAILED;
-
+    plugin_instance->delegate()->Query(
+        GetFileSystemURL(),
+        base::Bind(&DidReadMetadata, callback, info, file_system_type),
+        base::Bind(&DidFinishFileOperation, callback));
   }
   return PP_OK_COMPLETIONPENDING;
 }
@@ -504,12 +498,11 @@ int32_t PPB_FileRef_Impl::ReadDirectoryEntriesInHost(
 
   // TODO(yzshen): Passing base::Unretained(this) to the callback could
   // be dangerous.
-  if (!plugin_instance->delegate()->ReadDirectoryEntries(
-          GetFileSystemURL(),
-          base::Bind(&DidReadDirectory,
-                     callback, base::Unretained(this), files, file_types),
-          base::Bind(&DidFinishFileOperation, callback)))
-    return PP_ERROR_FAILED;
+  plugin_instance->delegate()->ReadDirectoryEntries(
+      GetFileSystemURL(),
+      base::Bind(&DidReadDirectory,
+                 callback, base::Unretained(this), files, file_types),
+      base::Bind(&DidFinishFileOperation, callback));
   return PP_OK_COMPLETIONPENDING;
 }