Update from https://crrev.com/320343

cc/test/test_context_provider.cc

 // Copyright 2013 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 "cc/test/test_context_provider.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 86 matching lines @@
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_.get();
 
   skia::RefPtr<class SkGLContext> gl_context =
       skia::AdoptRef(SkNullGLContext::Create(kNone_GrGLStandard));
   gl_context->makeCurrent();
   gr_context_ = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(gl_context->gl())));
+
+  // If GlContext is already lost, also abandon the new GrContext.
+  if (IsContextLost())
+    gr_context_->abandonContext();
+
   return gr_context_.get();
 }
 
 void TestContextProvider::SetupLock() {
 }
 
 base::Lock* TestContextProvider::GetLock() {
   return &context_lock_;
 }
 
@@ skipping 27 matching lines @@
 void TestContextProvider::OnLostContext() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   {
     base::AutoLock lock(destroyed_lock_);
     if (destroyed_)
       return;
     destroyed_ = true;
   }
   if (!lost_context_callback_.is_null())
     base::ResetAndReturn(&lost_context_callback_).Run();
+  if (gr_context_)
+    gr_context_->abandonContext();
 }
 
 TestWebGraphicsContext3D* TestContextProvider::TestContext3d() {
   DCHECK(bound_);
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   return context3d_.get();
 }
 
 TestWebGraphicsContext3D* TestContextProvider::UnboundTestContext3d() {
@@ skipping 20 matching lines @@
   DCHECK(memory_policy_changed_callback_.is_null() || cb.is_null());
   memory_policy_changed_callback_ = cb;
 }
 
 void TestContextProvider::SetMaxTransferBufferUsageBytes(
     size_t max_transfer_buffer_usage_bytes) {
   context3d_->SetMaxTransferBufferUsageBytes(max_transfer_buffer_usage_bytes);
 }
 
 }  // namespace cc