Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 0845883e185e198d5d91837bd9fae4da9262772c..d28580ecfd12fd751d22dc2bda374c8f948eb7cb 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -14,7 +14,6 @@ |
#include "base/command_line.h" |
#include "base/debug/crash_logging.h" |
#include "base/lazy_instance.h" |
-#include "base/location.h" |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/memory/discardable_memory_allocator.h" |
@@ -23,7 +22,7 @@ |
#include "base/metrics/field_trial.h" |
#include "base/metrics/histogram.h" |
#include "base/path_service.h" |
-#include "base/single_thread_task_runner.h" |
+#include "base/run_loop.h" |
#include "base/strings/string16.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_split.h" |
@@ -961,7 +960,7 @@ void RenderThreadImpl::Shutdown() { |
renderer_scheduler_->SetRAILModeObserver(nullptr); |
renderer_scheduler_->Shutdown(); |
if (main_message_loop_) |
gab
2016/07/08 18:36:08
This condition now looks a bit weird to me. Can we
fdoray
2016/07/08 20:19:04
if (main_message_loop_) isn't equivalent to checki
|
- main_message_loop_->RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
if (blink_platform_impl_) { |
blink_platform_impl_->Shutdown(); |