Merge 279934 "aw: Fix hardware teardown race"

android_webview/browser/shared_renderer_state.h

Index: android_webview/browser/shared_renderer_state.h
===================================================================
--- android_webview/browser/shared_renderer_state.h	(revision 280048)
+++ android_webview/browser/shared_renderer_state.h	(working copy)
@@ -56,10 +56,6 @@
   void SetHardwareAllowed(bool allowed);
   bool IsHardwareAllowed() const;
 
-  // Set by RT and read by UI.
-  void SetHardwareInitialized(bool initialized);
-  bool IsHardwareInitialized() const;
-
   void SetSharedContext(gpu::GLInProcessContext* context);
   gpu::GLInProcessContext* GetSharedContext() const;
 
@@ -81,7 +77,6 @@
   mutable base::Lock lock_;
   scoped_ptr<DrawGLInput> draw_gl_input_;
   bool hardware_allowed_;
-  bool hardware_initialized_;
   gpu::GLInProcessContext* share_context_;
   cc::ReturnedResourceArray returned_resources_;
 };