Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 64 matching lines @@
   OutputSurfaceWithoutParent(
       const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
       base::WeakPtr<CompositorImpl> compositor_impl)
       : cc::OutputSurface(context_provider),
         swap_buffers_completion_callback_(
             base::Bind(&OutputSurfaceWithoutParent::OnSwapBuffersCompleted,
                        base::Unretained(this))) {
     capabilities_.adjust_deadline_for_parent = false;
     capabilities_.max_frames_pending = 2;
     compositor_impl_ = compositor_impl;
-    main_thread_ = base::ThreadTaskRunnerHandle::Get();
+    main_thread_ = base::MessageLoopProxy::current();
   }
 
   void SwapBuffers(cc::CompositorFrame* frame) override {
     GetCommandBufferProxy()->SetLatencyInfo(frame->metadata.latency_info);
     DCHECK(frame->gl_frame_data->sub_buffer_rect ==
            gfx::Rect(frame->gl_frame_data->size));
     context_provider_->ContextSupport()->Swap();
     client_->DidSwapBuffers();
   }
 
@@ skipping 27 matching lines @@
   void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info,
                               gfx::SwapResult result) {
     RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
     OutputSurface::OnSwapBuffersComplete();
   }
 
   base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&,
                                 gfx::SwapResult)>
       swap_buffers_completion_callback_;
 
-  scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
+  scoped_refptr<base::MessageLoopProxy> main_thread_;
   base::WeakPtr<CompositorImpl> compositor_impl_;
 };
 
 static bool g_initialized = false;
 
 bool g_use_surface_manager = false;
 base::LazyInstance<cc::SurfaceManager> g_surface_manager =
     LAZY_INSTANCE_INITIALIZER;
 
 
@@ skipping 156 matching lines @@
                "trigger", trigger,
                "delay", delay.InMillisecondsF());
 
   DCHECK(composite_on_vsync_trigger_ == DO_NOT_COMPOSITE);
   if (current_composite_task_)
     current_composite_task_->Cancel();
 
   // Unretained because we cancel the task on shutdown.
   current_composite_task_.reset(new base::CancelableClosure(
       base::Bind(&CompositorImpl::Composite, base::Unretained(this), trigger)));
-  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+  base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, current_composite_task_->callback(), delay);
 }
 
 void CompositorImpl::Composite(CompositingTrigger trigger) {
   if (trigger == COMPOSITE_IMMEDIATELY)
     will_composite_immediately_ = false;
 
   DCHECK(host_);
   DCHECK(trigger == COMPOSITE_IMMEDIATELY || trigger == COMPOSITE_EVENTUALLY);
   DCHECK(needs_composite_);
@@ skipping 329 matching lines @@
   scoped_ptr<cc::OutputSurface> real_output_surface(
       new OutputSurfaceWithoutParent(context_provider,
                                      weak_factory_.GetWeakPtr()));
 
   cc::SurfaceManager* manager = GetSurfaceManager();
   if (manager) {
     display_client_.reset(new cc::OnscreenDisplayClient(
         real_output_surface.Pass(), manager, HostSharedBitmapManager::current(),
         BrowserGpuMemoryBufferManager::current(),
         host_->settings().renderer_settings,
-        base::ThreadTaskRunnerHandle::Get()));
+        base::MessageLoopProxy::current()));
     scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
         new cc::SurfaceDisplayOutputSurface(
             manager, surface_id_allocator_.get(), context_provider));
 
     display_client_->set_surface_output_surface(surface_output_surface.get());
     surface_output_surface->set_display_client(display_client_.get());
     display_client_->display()->Resize(size_);
     host_->SetOutputSurface(surface_output_surface.Pass());
   } else {
     host_->SetOutputSurface(real_output_surface.Pass());
@@ skipping 90 matching lines @@
 
 void CompositorImpl::SetNeedsAnimate() {
   needs_animate_ = true;
   if (!host_)
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content