1 files changed, 5 insertions, 32 deletions
diff --git a/chromium/third_party/blink/renderer/platform/exported/platform.cc b/chromium/third_party/blink/renderer/platform/exported/platform.cc
index 55f9e8146b7..d498e7d31b7 100644
--- a/chromium/third_party/blink/renderer/platform/exported/platform.cc
+++ b/chromium/third_party/blink/renderer/platform/exported/platform.cc
@@ -38,13 +38,11 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "build/build_config.h"
-#include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h"
-#include "third_party/blink/public/platform/interface_provider.h"
 #include "third_party/blink/public/platform/scheduler/web_thread_scheduler.h"
 #include "third_party/blink/public/platform/web_graphics_context_3d_provider.h"
-#include "third_party/blink/public/platform/web_prerendering_support.h"
 #include "third_party/blink/public/platform/websocket_handshake_throttle.h"
+#include "third_party/blink/renderer/platform/bindings/blink_isolate/blink_isolate.h"
 #include "third_party/blink/renderer/platform/bindings/parkable_string_manager.h"
 #include "third_party/blink/renderer/platform/font_family_names.h"
 #include "third_party/blink/renderer/platform/fonts/font_cache_memory_dump_provider.h"
@@ -69,22 +67,6 @@ namespace blink {
 
 namespace {
 
-class DefaultInterfaceProvider : public InterfaceProvider {
-  USING_FAST_MALLOC(DefaultInterfaceProvider);
-
- public:
-  DefaultInterfaceProvider() = default;
-  ~DefaultInterfaceProvider() = default;
-
-  // InterfaceProvider implementation:
-  void GetInterface(const char* interface_name,
-                    mojo::ScopedMessagePipeHandle interface_pipe) override {
-    Platform::Current()->GetBrowserInterfaceBroker()->GetInterface(
-        mojo::GenericPendingReceiver(interface_name,
-                                     std::move(interface_pipe)));
-  }
-};
-
 class DefaultBrowserInterfaceBrokerProxy
     : public ThreadSafeBrowserInterfaceBrokerProxy {
   USING_FAST_MALLOC(DefaultBrowserInterfaceBrokerProxy);
@@ -140,13 +122,6 @@ static Platform* g_platform = nullptr;
 
 static GCTaskRunner* g_gc_task_runner = nullptr;
 
-static void CallOnMainThreadFunction(WTF::MainThreadFunction function,
-                                     void* context) {
-  PostCrossThreadTask(
-      *Thread::MainThread()->GetTaskRunner(), FROM_HERE,
-      CrossThreadBindOnce(function, CrossThreadUnretained(context)));
-}
-
 Platform::Platform() {
   WTF::Partitions::Initialize();
 }
@@ -157,6 +132,8 @@ namespace {
 
 class SimpleMainThread : public Thread {
  public:
+  SimpleMainThread() : isolate_(WebIsolate::Create()) {}
+
   // We rely on base::ThreadTaskRunnerHandle for tasks posted on the main
   // thread. The task runner handle may not be available on Blink's startup
   // (== on SimpleMainThread's construction), because some tests like
@@ -190,6 +167,7 @@ class SimpleMainThread : public Thread {
  private:
   bool IsSimpleMainThread() const override { return true; }
 
+  std::unique_ptr<WebIsolate> isolate_;
   scheduler::SimpleThreadScheduler scheduler_;
   scoped_refptr<base::SingleThreadTaskRunner>
       main_thread_task_runner_for_testing_;
@@ -215,7 +193,7 @@ void Platform::CreateMainThreadAndInitialize(Platform* platform) {
 
 void Platform::InitializeCommon(Platform* platform,
                                 std::unique_ptr<Thread> main_thread) {
-  WTF::Initialize(CallOnMainThreadFunction);
+  WTF::Initialize();
 
   Thread::SetMainThread(std::move(main_thread));
 
@@ -287,11 +265,6 @@ Platform* Platform::Current() {
   return g_platform;
 }
 
-InterfaceProvider* Platform::GetInterfaceProvider() {
-  DEFINE_STATIC_LOCAL(DefaultInterfaceProvider, provider, ());
-  return &provider;
-}
-
 ThreadSafeBrowserInterfaceBrokerProxy* Platform::GetBrowserInterfaceBroker() {
   DEFINE_STATIC_LOCAL(DefaultBrowserInterfaceBrokerProxy, proxy, ());
   return &proxy;