diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc index 9f3e1c8f9a..c9ef9a7d4a 100644 --- a/atom/app/node_main.cc +++ b/atom/app/node_main.cc @@ -18,7 +18,7 @@ #include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/feature_list.h" -#include "base/task/task_scheduler/task_scheduler.h" +#include "base/task/thread_pool/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "gin/array_buffer.h" #include "gin/public/isolate_holder.h" @@ -48,7 +48,7 @@ int NodeMain(int argc, char* argv[]) { gin::V8Initializer::LoadV8Natives(); // V8 requires a task scheduler apparently - base::TaskScheduler::CreateAndStartWithDefaultParams("Electron"); + base::ThreadPool::CreateAndStartWithDefaultParams("Electron"); // Initialize gin::IsolateHolder. JavascriptEnvironment gin_env(loop); @@ -112,10 +112,10 @@ int NodeMain(int argc, char* argv[]) { // According to "src/gin/shell/gin_main.cc": // - // gin::IsolateHolder waits for tasks running in TaskScheduler in its - // destructor and thus must be destroyed before TaskScheduler starts skipping + // gin::IsolateHolder waits for tasks running in ThreadPool in its + // destructor and thus must be destroyed before ThreadPool starts skipping // CONTINUE_ON_SHUTDOWN tasks. - base::TaskScheduler::GetInstance()->Shutdown(); + base::ThreadPool::GetInstance()->Shutdown(); v8::V8::Dispose(); diff --git a/atom/browser/io_thread.cc b/atom/browser/io_thread.cc index 10fac020f8..1e108e6002 100644 --- a/atom/browser/io_thread.cc +++ b/atom/browser/io_thread.cc @@ -70,5 +70,5 @@ void IOThread::CleanUp() { system_request_context_->proxy_resolution_service()->OnShutdown(); if (net_log_) - net_log_->ShutDownBeforeTaskScheduler(); + net_log_->ShutDownBeforeThreadPool(); } diff --git a/atom/browser/javascript_environment.cc b/atom/browser/javascript_environment.cc index 421094817a..a94d17fd64 100644 --- a/atom/browser/javascript_environment.cc +++ b/atom/browser/javascript_environment.cc @@ -10,7 +10,7 @@ #include "atom/common/node_includes.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" -#include "base/task/task_scheduler/initialization_util.h" +#include "base/task/thread_pool/initialization_util.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/common/content_switches.h" #include "gin/array_buffer.h"