Android: Remove Surface cruft

content/content_common.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../build/temp_gyp/googleurl.gyp:googleurl',
     '../components/components_tracing.gyp:tracing',
     '../media/media.gyp:media',
@@ skipping 97 matching lines @@
     'common/android/address_parser_internal.cc',
     'common/android/address_parser_internal.h',
     'common/android/command_line.cc',
     'common/android/command_line.h',
     'common/android/common_jni_registrar.cc',
     'common/android/common_jni_registrar.h',
     'common/android/device_telephony_info.cc',
     'common/android/device_telephony_info.h',
     'common/android/hash_set.cc',
     'common/android/hash_set.h',
-    'common/android/surface_callback.cc',
-    'common/android/surface_callback.h',
+    'common/android/surface.cc',
+    'common/android/surface.h',
     'common/android/surface_texture_bridge.cc',
     'common/android/surface_texture_bridge.h',
     'common/android/surface_texture_listener.cc',
     'common/android/surface_texture_listener.h',
     'common/android/surface_texture_peer.cc',
     'common/android/surface_texture_peer.h',
     'common/android/trace_event_binding.cc',
     'common/android/trace_event_binding.h',
     'common/appcache/appcache_backend_proxy.cc',
     'common/appcache/appcache_backend_proxy.h',
@@ skipping 444 matching lines @@
         '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
         '<(output)',
         '<(PRODUCT_DIR)',
         ],
         'msvs_cygwin_shell': 1,
       },
      ]
     }],
   ],
 }