Merge 279934 "aw: Fix hardware teardown race"

android_webview/browser/shared_renderer_state.cc

Index: android_webview/browser/shared_renderer_state.cc
===================================================================
--- android_webview/browser/shared_renderer_state.cc	(revision 280048)
+++ android_webview/browser/shared_renderer_state.cc	(working copy)
@@ -24,7 +24,6 @@
       weak_factory_on_ui_thread_(this),
       ui_thread_weak_ptr_(weak_factory_on_ui_thread_.GetWeakPtr()),
       hardware_allowed_(false),
-      hardware_initialized_(false),
       share_context_(NULL) {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   DCHECK(client_on_ui_);
@@ -71,16 +70,6 @@
   return hardware_allowed_;
 }
 
-void SharedRendererState::SetHardwareInitialized(bool initialized) {
-  base::AutoLock lock(lock_);
-  hardware_initialized_ = initialized;
-}
-
-bool SharedRendererState::IsHardwareInitialized() const {
-  base::AutoLock lock(lock_);
-  return hardware_initialized_;
-}
-
 void SharedRendererState::SetSharedContext(gpu::GLInProcessContext* context) {
   base::AutoLock lock(lock_);
   DCHECK(!share_context_ || !context);