Update from https://crrev.com/308331

cc/resources/scoped_gpu_raster.cc

Index: cc/resources/scoped_gpu_raster.cc
diff --git a/cc/resources/scoped_gpu_raster.cc b/cc/resources/scoped_gpu_raster.cc
index 517c7a7d81465371729cda5f4b2ca99aaa97917e..9d1dfe53dc603cbdd5a3e60ee2cb96ac8edee26b 100644
--- a/cc/resources/scoped_gpu_raster.cc
+++ b/cc/resources/scoped_gpu_raster.cc
@@ -30,18 +30,14 @@ void ScopedGpuRaster::BeginGpuRaster() {
   gl->PushGroupMarkerEXT(0, "GpuRasterization");
 
   class GrContext* gr_context = context_provider_->GrContext();
-  // TODO(sohanjg): Remove when TestContextProvider gives a GrContext.
-  if (gr_context)
-    gr_context->resetContext();
+  gr_context->resetContext();
 }
 
 void ScopedGpuRaster::EndGpuRaster() {
   GLES2Interface* gl = context_provider_->ContextGL();
 
   class GrContext* gr_context = context_provider_->GrContext();
-  // TODO(sohanjg): Remove when TestContextProvider gives a GrContext.
-  if (gr_context)
-    gr_context->flush();
+  gr_context->flush();
 
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function