Part 1: Refactor Android WebView graphics code

android_webview/browser/deferred_gpu_command_service.cc

Index: android_webview/browser/deferred_gpu_command_service.cc
diff --git a/android_webview/browser/deferred_gpu_command_service.cc b/android_webview/browser/deferred_gpu_command_service.cc
index b9b77dd0e6864d3e3f400ce61bf0fef79465f03a..d80f76d2b20426b065fcac945df0ab219f093447 100644
--- a/android_webview/browser/deferred_gpu_command_service.cc
+++ b/android_webview/browser/deferred_gpu_command_service.cc
@@ -4,8 +4,8 @@
 
 #include "android_webview/browser/deferred_gpu_command_service.h"
 
+#include "android_webview/browser/compositor_proxy.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
-#include "android_webview/browser/shared_renderer_state.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
@@ -70,13 +70,13 @@ DeferredGpuCommandService::~DeferredGpuCommandService() {
 // This method can be called on any thread.
 // static
 void DeferredGpuCommandService::RequestProcessGL() {
-  SharedRendererState* renderer_state =
+  CompositorProxy* compositor_proxy =
       GLViewRendererManager::GetInstance()->GetMostRecentlyDrawn();
-  if (!renderer_state) {
+  if (!compositor_proxy) {
     LOG(ERROR) << "No hardware renderer. Deadlock likely";
     return;
   }
-  renderer_state->ClientRequestDrawGL();
+  compositor_proxy->ClientRequestDrawGL();
 }
 
 // Called from different threads!