cc: Refactor ResourceProvider.

cc/test/pixel_test.cc

Index: cc/test/pixel_test.cc
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
index 73abc1c3828bd6cda9eab556cda460fff187ea9e..889a8070564dfe24c006b0257e076dfe485cd550 100644
--- a/cc/test/pixel_test.cc
+++ b/cc/test/pixel_test.cc
@@ -25,8 +25,11 @@
 #include "cc/test/pixel_test_utils.h"
 #include "cc/test/test_in_process_context_provider.h"
 #include "cc/test/test_shared_bitmap_manager.h"
+#include "gpu/command_buffer/client/gles2_interface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using gpu::gles2::GLES2Interface;
+
 namespace cc {
 
 PixelTest::PixelTest()
@@ -71,7 +74,8 @@ bool PixelTest::RunPixelTestWithReadbackTarget(
                        disable_picture_quad_image_filtering_);
 
   // Wait for the readback to complete.
-  resource_provider_->Finish();
+  if (output_surface_->context_provider())
+    output_surface_->context_provider()->ContextGL()->Finish();
   run_loop.Run();
 
   return PixelsMatchReference(ref_file, comparator);