| Index: content/renderer/renderer_blink_platform_impl.cc
|
| diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
| index 9a7a34dbcd8fca9a5ebf4b8d1bdf17ce5fd585ba..945dfe062384fc669a88cc8335c0f127ea92f725 100644
|
| --- a/content/renderer/renderer_blink_platform_impl.cc
|
| +++ b/content/renderer/renderer_blink_platform_impl.cc
|
| @@ -21,10 +21,6 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "build/build_config.h"
|
| -#include "components/scheduler/child/web_scheduler_impl.h"
|
| -#include "components/scheduler/child/web_task_runner_impl.h"
|
| -#include "components/scheduler/renderer/renderer_scheduler.h"
|
| -#include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
|
| #include "components/url_formatter/url_formatter.h"
|
| #include "content/child/blob_storage/webblobregistry_impl.h"
|
| #include "content/child/database_util.h"
|
| @@ -102,6 +98,7 @@
|
| #include "third_party/WebKit/public/platform/mime_registry.mojom.h"
|
| #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionListener.h"
|
| #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationListener.h"
|
| +#include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
|
| #include "url/gurl.h"
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -240,7 +237,7 @@ class RendererBlinkPlatformImpl::SandboxSupport
|
| //------------------------------------------------------------------------------
|
|
|
| RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
|
| - scheduler::RendererScheduler* renderer_scheduler,
|
| + blink::scheduler::RendererScheduler* renderer_scheduler,
|
| base::WeakPtr<shell::InterfaceProvider> remote_interfaces)
|
| : BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()),
|
| main_thread_(renderer_scheduler->CreateMainThread()),
|
| @@ -253,8 +250,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
|
| loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
|
| web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
|
| renderer_scheduler_(renderer_scheduler),
|
| - blink_service_registry_(
|
| - new BlinkServiceRegistryImpl(remote_interfaces)) {
|
| + blink_service_registry_(new BlinkServiceRegistryImpl(remote_interfaces)) {
|
| #if !defined(OS_ANDROID) && !defined(OS_WIN)
|
| if (g_sandbox_enabled && sandboxEnabled()) {
|
| sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
|
| @@ -301,8 +297,7 @@ blink::WebURLLoader* RendererBlinkPlatformImpl::createURLLoader() {
|
| // There may be no child thread in RenderViewTests. These tests can still use
|
| // data URLs to bypass the ResourceDispatcher.
|
| return new content::WebURLLoaderImpl(
|
| - child_thread ? child_thread->resource_dispatcher() : NULL,
|
| - base::WrapUnique(currentThread()->getWebTaskRunner()->clone()));
|
| + child_thread ? child_thread->resource_dispatcher() : NULL);
|
| }
|
|
|
| blink::WebThread* RendererBlinkPlatformImpl::currentThread() {
|
|
|