cc: Merge PictureImageLayerImpl and PictureLayerImpl.

cc/cc.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,
   },
   'targets': [
     {
@@ skipping 187 matching lines @@
         'layers/nine_patch_layer.h',
         'layers/nine_patch_layer_impl.cc',
         'layers/nine_patch_layer_impl.h',
         'layers/paint_properties.h',
         'layers/painted_scrollbar_layer.cc',
         'layers/painted_scrollbar_layer.h',
         'layers/painted_scrollbar_layer_impl.cc',
         'layers/painted_scrollbar_layer_impl.h',
         'layers/picture_image_layer.cc',
         'layers/picture_image_layer.h',
-        'layers/picture_image_layer_impl.cc',
-        'layers/picture_image_layer_impl.h',
         'layers/picture_layer.cc',
         'layers/picture_layer.h',
         'layers/picture_layer_impl.cc',
         'layers/picture_layer_impl.h',
         'layers/render_pass_sink.h',
         'layers/render_surface_impl.cc',
         'layers/render_surface_impl.h',
         'layers/scrollbar_layer_impl_base.cc',
         'layers/scrollbar_layer_impl_base.h',
         'layers/scrollbar_layer_interface.h',
@@ skipping 481 matching lines @@
         'surfaces/surface_resource_holder.h',
         'surfaces/surface_sequence.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }