Update from https://crrev.com/308331

cc/cc_tests.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'cc_unit_tests_source_files': [
       'animation/animation_unittest.cc',
       'animation/keyframed_animation_curve_unittest.cc',
@@ skipping 174 matching lines @@
       'test/fake_scrollbar.cc',
       'test/fake_scrollbar.h',
       'test/fake_tile_manager.cc',
       'test/fake_tile_manager.h',
       'test/fake_tile_manager_client.cc',
       'test/fake_tile_manager_client.h',
       'test/fake_ui_resource_layer_tree_host_impl.cc',
       'test/fake_ui_resource_layer_tree_host_impl.h',
       'test/fake_video_frame_provider.cc',
       'test/fake_video_frame_provider.h',
+      'test/failure_output_surface.cc',
+      'test/failure_output_surface.h',
       'test/geometry_test_utils.cc',
       'test/geometry_test_utils.h',
       'test/test_in_process_context_provider.cc',
       'test/test_in_process_context_provider.h',
       'test/impl_side_painting_settings.h',
       'test/layer_test_common.cc',
       'test/layer_test_common.h',
       'test/layer_tree_host_common_test.cc',
       'test/layer_tree_host_common_test.h',
       'test/layer_tree_json_parser.cc',
@@ skipping 227 matching lines @@
             'variables': {
               'test_suite_name': 'cc_perftests',
             },
             'includes': [ '../build/apk_test.gypi' ],
           },
         ],
       }
     ]
   ],
 }