Make SingleThreadProxy a SchedulerClient

cc/test/test_web_graphics_context_3d.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_web_graphics_context_3d.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 426 matching lines @@
     mailbox_name1 = '1';
     ++mailbox_name2;
   }
 }
 
 void TestWebGraphicsContext3D::loseContextCHROMIUM(GLenum current,
                                                    GLenum other) {
   if (context_lost_)
     return;
   context_lost_ = true;
-  if (!context_lost_callback_.is_null())
-    context_lost_callback_.Run();
 
   for (size_t i = 0; i < shared_contexts_.size(); ++i)
     shared_contexts_[i]->loseContextCHROMIUM(current, other);
   shared_contexts_.clear();
+
+  // In the single thread case, this could cause the context to be
+  // synchronously deleted, so do it last.
+  if (!context_lost_callback_.is_null())
+    context_lost_callback_.Run();
 }
 
 void TestWebGraphicsContext3D::finish() {
   test_support_->CallAllSyncPointCallbacks();
 }
 
 void TestWebGraphicsContext3D::flush() {
   test_support_->CallAllSyncPointCallbacks();
 }
 
@@ skipping 257 matching lines @@
 
 TestWebGraphicsContext3D::Buffer::Buffer() : target(0), size(0) {}
 
 TestWebGraphicsContext3D::Buffer::~Buffer() {}
 
 TestWebGraphicsContext3D::Image::Image() {}
 
 TestWebGraphicsContext3D::Image::~Image() {}
 
 }  // namespace cc