Update from https://crrev.com/304715

cc/test/layer_tree_pixel_resource_test.cc

 // Copyright 2014 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/layer_tree_pixel_resource_test.h"
 
 #include "cc/layers/layer.h"
 #include "cc/resources/bitmap_raster_worker_pool.h"
 #include "cc/resources/gpu_raster_worker_pool.h"
 #include "cc/resources/one_copy_raster_worker_pool.h"
 #include "cc/resources/pixel_buffer_raster_worker_pool.h"
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/zero_copy_raster_worker_pool.h"
 #include "cc/test/fake_output_surface.h"
 #include "gpu/GLES2/gl2extchromium.h"
 
 namespace cc {
 
 namespace {
 
 bool IsTestCaseSupported(PixelResourceTestCase test_case) {
   switch (test_case) {
     case SOFTWARE:
     case GL_GPU_RASTER_2D_DRAW:
     case GL_ZERO_COPY_2D_DRAW:
     case GL_ZERO_COPY_RECT_DRAW:
+    case GL_ONE_COPY_2D_STAGING_2D_DRAW:
     case GL_ASYNC_UPLOAD_2D_DRAW:
       return true;
     case GL_ZERO_COPY_EXTERNAL_DRAW:
-    case GL_ONE_COPY_2D_STAGING_2D_DRAW:
     case GL_ONE_COPY_RECT_STAGING_2D_DRAW:
     case GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW:
       // These should all be enabled in practice.
-      // TODO(reveman): one copy not supported in unit tests yet.
+      // TODO(reveman): one copy with rect not supported in unit tests yet.
       // TODO(enne): look into getting texture external oes enabled.
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace
 
@@ skipping 170 matching lines @@
   if (!IsTestCaseSupported(test_case_))
     return;
   RunPixelTest(test_type_, content_root, file_name);
 }
 
 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
     : LayerTreeHostPixelResourceTest(GetParam()) {
 }
 
 }  // namespace cc