diff --git a/libcef/browser/browser_message_loop.cc b/libcef/browser/browser_message_loop.cc index e287c3d3e..fbca1db56 100644 --- a/libcef/browser/browser_message_loop.cc +++ b/libcef/browser/browser_message_loop.cc @@ -7,7 +7,6 @@ #include "libcef/common/content_client.h" #include "base/memory/ptr_util.h" -#include "base/run_loop.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -103,20 +102,3 @@ CefBrowserMessageLoop::CefBrowserMessageLoop() } CefBrowserMessageLoop::~CefBrowserMessageLoop() {} - -// static -CefBrowserMessageLoop* CefBrowserMessageLoop::current() { - base::MessageLoop* loop = base::MessageLoop::current(); - DCHECK(loop->IsType(base::MessageLoop::TYPE_UI)); - return static_cast(loop); -} - -void CefBrowserMessageLoop::DoMessageLoopIteration() { - base::RunLoop run_loop; - run_loop.RunUntilIdle(); -} - -void CefBrowserMessageLoop::RunMessageLoop() { - base::RunLoop run_loop; - run_loop.Run(); -} diff --git a/libcef/browser/browser_message_loop.h b/libcef/browser/browser_message_loop.h index 6dff39673..62eea72fd 100644 --- a/libcef/browser/browser_message_loop.h +++ b/libcef/browser/browser_message_loop.h @@ -17,15 +17,6 @@ class CefBrowserMessageLoop : public base::MessageLoopForUI { CefBrowserMessageLoop(); ~CefBrowserMessageLoop() override; - // Returns the CefBrowserMessageLoop of the current thread. - static CefBrowserMessageLoop* current(); - - // Do a single interation of the UI message loop. - void DoMessageLoopIteration(); - - // Run the UI message loop. - void RunMessageLoop(); - private: DISALLOW_COPY_AND_ASSIGN(CefBrowserMessageLoop); }; diff --git a/libcef/browser/context.cc b/libcef/browser/context.cc index 2deb32f62..633ca1764 100644 --- a/libcef/browser/context.cc +++ b/libcef/browser/context.cc @@ -7,7 +7,6 @@ #include "libcef/browser/browser_info.h" #include "libcef/browser/browser_info_manager.h" #include "libcef/browser/browser_main.h" -#include "libcef/browser/browser_message_loop.h" #include "libcef/browser/chrome_browser_process_stub.h" #include "libcef/browser/thread_util.h" #include "libcef/browser/trace_subscriber.h" @@ -21,6 +20,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/files/file_util.h" +#include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/app/content_service_manager_main_delegate.h" @@ -271,7 +271,8 @@ void CefDoMessageLoopWork() { return; } - CefBrowserMessageLoop::current()->DoMessageLoopIteration(); + base::RunLoop run_loop; + run_loop.RunUntilIdle(); } void CefRunMessageLoop() { @@ -287,7 +288,8 @@ void CefRunMessageLoop() { return; } - CefBrowserMessageLoop::current()->RunMessageLoop(); + base::RunLoop run_loop; + run_loop.Run(); } void CefQuitMessageLoop() {