aura: Attach lost context callback to the shared main thread context

content/browser/aura/gpu_process_transport_factory.cc

Index: content/browser/aura/gpu_process_transport_factory.cc
diff --git a/content/browser/aura/gpu_process_transport_factory.cc b/content/browser/aura/gpu_process_transport_factory.cc
index e9080f03efafec531bda87582a838b5e27f0066a..2d09b244e8be30767ee4279cb2c42a5196b03c69 100644
--- a/content/browser/aura/gpu_process_transport_factory.cc
+++ b/content/browser/aura/gpu_process_transport_factory.cc
@@ -407,16 +407,6 @@ GpuProcessTransportFactory::OffscreenCompositorContextProvider() {
       GpuProcessTransportFactory::CreateOffscreenCommandBufferContext(),
       "Compositor-Offscreen");
 
-  if (!offscreen_compositor_contexts_.get())
-    return NULL;
-
-  if (!ui::Compositor::WasInitializedWithThread()) {
-    offscreen_compositor_contexts_->SetLostContextCallback(base::Bind(
-        &GpuProcessTransportFactory::
-            OnLostMainThreadSharedContextInsideCallback,
-        callback_factory_.GetWeakPtr()));
-  }
-
   return offscreen_compositor_contexts_;
 }
 
@@ -440,9 +430,14 @@ GpuProcessTransportFactory::SharedMainThreadContextProvider() {
             OffscreenCompositorContextProvider().get());
   }
 
-  if (shared_main_thread_contexts_ &&
-      !shared_main_thread_contexts_->BindToCurrentThread())
-    shared_main_thread_contexts_ = NULL;
+  if (shared_main_thread_contexts_) {
+    shared_main_thread_contexts_->SetLostContextCallback(
+        base::Bind(&GpuProcessTransportFactory::
+                        OnLostMainThreadSharedContextInsideCallback,
+                   callback_factory_.GetWeakPtr()));
+    if (!shared_main_thread_contexts_->BindToCurrentThread())
+      shared_main_thread_contexts_ = NULL;
+  }
   return shared_main_thread_contexts_;
 }