| Index: components/nacl/renderer/ppb_nacl_private_impl.cc
|
| diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
|
| index e77b977ff13bddc12dccdf9cf8c787440ef06980..fea1b3d8ad0a3daac4f46f6ce71a6899e04506af 100644
|
| --- a/components/nacl/renderer/ppb_nacl_private_impl.cc
|
| +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
|
| @@ -16,10 +16,13 @@
|
| #include "base/files/file.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/lazy_instance.h"
|
| +#include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/rand_util.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| +#include "base/thread_task_runner_handle.h"
|
| #include "components/nacl/common/nacl_host_messages.h"
|
| #include "components/nacl/common/nacl_messages.h"
|
| #include "components/nacl/common/nacl_nonsfi_util.h"
|
| @@ -255,9 +258,8 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
|
| if (process_type_ != kNativeNaClProcessType &&
|
| process_type_ != kPNaClTranslatorProcessType) {
|
| // Return an error.
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback, base::Passed(base::File()), 0, 0));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(callback, base::Passed(base::File()), 0, 0));
|
| return;
|
| }
|
|
|
| @@ -272,9 +274,8 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
|
| bool is_helper_process = process_type_ == kPNaClTranslatorProcessType;
|
| if (!ManifestResolveKey(pp_instance_, is_helper_process, key, &url,
|
| &pnacl_options)) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback, base::Passed(base::File()), 0, 0));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(callback, base::Passed(base::File()), 0, 0));
|
| return;
|
| }
|
|
|
| @@ -1400,11 +1401,9 @@ void DownloadFile(PP_Instance instance,
|
| NexeLoadManager* load_manager = GetNexeLoadManager(instance);
|
| DCHECK(load_manager);
|
| if (!load_manager) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback,
|
| - static_cast<int32_t>(PP_ERROR_FAILED),
|
| - kInvalidNaClFileInfo));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(callback, static_cast<int32_t>(PP_ERROR_FAILED),
|
| + kInvalidNaClFileInfo));
|
| return;
|
| }
|
|
|
| @@ -1417,15 +1416,13 @@ void DownloadFile(PP_Instance instance,
|
| &file_info.token_lo,
|
| &file_info.token_hi);
|
| if (handle == PP_kInvalidFileHandle) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback,
|
| - static_cast<int32_t>(PP_ERROR_FAILED),
|
| - kInvalidNaClFileInfo));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(callback, static_cast<int32_t>(PP_ERROR_FAILED),
|
| + kInvalidNaClFileInfo));
|
| return;
|
| }
|
| file_info.handle = handle;
|
| - base::MessageLoop::current()->PostTask(
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, static_cast<int32_t>(PP_OK), file_info));
|
| return;
|
| @@ -1435,11 +1432,9 @@ void DownloadFile(PP_Instance instance,
|
| // before downloading it.
|
| const GURL& test_gurl = load_manager->plugin_base_url().Resolve(url);
|
| if (!test_gurl.is_valid()) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback,
|
| - static_cast<int32_t>(PP_ERROR_FAILED),
|
| - kInvalidNaClFileInfo));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(callback, static_cast<int32_t>(PP_ERROR_FAILED),
|
| + kInvalidNaClFileInfo));
|
| return;
|
| }
|
|
|
| @@ -1455,7 +1450,7 @@ void DownloadFile(PP_Instance instance,
|
| file_info.handle = file_handle;
|
| file_info.token_lo = file_token_lo;
|
| file_info.token_hi = file_token_hi;
|
| - base::MessageLoop::current()->PostTask(
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, static_cast<int32_t>(PP_OK), file_info));
|
| return;
|
| @@ -1469,11 +1464,9 @@ void DownloadFile(PP_Instance instance,
|
| content::PepperPluginInstance* plugin_instance =
|
| content::PepperPluginInstance::Get(instance);
|
| if (!plugin_instance) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback,
|
| - static_cast<int32_t>(PP_ERROR_FAILED),
|
| - kInvalidNaClFileInfo));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(callback, static_cast<int32_t>(PP_ERROR_FAILED),
|
| + kInvalidNaClFileInfo));
|
| }
|
| const blink::WebDocument& document =
|
| plugin_instance->GetContainer()->element().document();
|
| @@ -1661,11 +1654,9 @@ void StreamPexe(PP_Instance instance,
|
| content::PepperPluginInstance* plugin_instance =
|
| content::PepperPluginInstance::Get(instance);
|
| if (!plugin_instance) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(handler->DidFinishStream,
|
| - handler_user_data,
|
| - static_cast<int32_t>(PP_ERROR_FAILED)));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(handler->DidFinishStream, handler_user_data,
|
| + static_cast<int32_t>(PP_ERROR_FAILED)));
|
| return;
|
| }
|
|
|
|
|