Update from https://crrev.com/307758

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_tile_task_worker_pool.h"
 #include "cc/resources/gpu_tile_task_worker_pool.h"
 #include "cc/resources/one_copy_tile_task_worker_pool.h"
@@ skipping 29 matching lines @@
   return false;
 }
 
 }  // namespace
 
 LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest(
     PixelResourceTestCase test_case)
     : staging_texture_target_(GL_INVALID_VALUE),
       draw_texture_target_(GL_INVALID_VALUE),
       resource_pool_option_(BITMAP_TILE_TASK_WORKER_POOL),
+      initialized_(false),
       test_case_(test_case) {
   InitializeFromTestCase(test_case);
 }
 
+LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest()
+    : staging_texture_target_(GL_INVALID_VALUE),
+      draw_texture_target_(GL_INVALID_VALUE),
+      resource_pool_option_(BITMAP_TILE_TASK_WORKER_POOL),
+      initialized_(false),
+      test_case_(SOFTWARE) {
+}
+
 void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
     PixelResourceTestCase test_case) {
+  DCHECK(!initialized_);
+  initialized_ = true;
   switch (test_case) {
     case SOFTWARE:
       test_type_ = PIXEL_TEST_SOFTWARE;
       staging_texture_target_ = GL_INVALID_VALUE;
       draw_texture_target_ = GL_INVALID_VALUE;
       resource_pool_option_ = BITMAP_TILE_TASK_WORKER_POOL;
       return;
     case GL_GPU_RASTER_2D_DRAW:
       test_type_ = PIXEL_TEST_GL;
       staging_texture_target_ = GL_INVALID_VALUE;
@@ skipping 48 matching lines @@
 
 void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
     LayerTreeHostImpl* host_impl,
     scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
     scoped_ptr<ResourcePool>* resource_pool,
     scoped_ptr<ResourcePool>* staging_resource_pool) {
   base::SingleThreadTaskRunner* task_runner =
       proxy()->HasImplThread() ? proxy()->ImplThreadTaskRunner()
                                : proxy()->MainThreadTaskRunner();
   DCHECK(task_runner);
+  DCHECK(initialized_);
 
   ContextProvider* context_provider =
       host_impl->output_surface()->context_provider();
   ResourceProvider* resource_provider = host_impl->resource_provider();
   bool use_distance_field_text = false;
   size_t max_transfer_buffer_usage_bytes = 1024u * 1024u * 60u;
 
   switch (resource_pool_option_) {
     case BITMAP_TILE_TASK_WORKER_POOL:
       EXPECT_FALSE(context_provider);
@@ skipping 71 matching lines @@
   if (!IsTestCaseSupported(test_case_))
     return;
   RunPixelTest(test_type_, content_root, file_name);
 }
 
 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
     : LayerTreeHostPixelResourceTest(GetParam()) {
 }
 
 }  // namespace cc