Move webkit/renderer/media/android/ to content/renderer/media/android/.

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 385 matching lines @@
         'renderer/active_notification_tracker_unittest.cc',
         'renderer/android/email_detector_unittest.cc',
         'renderer/android/phone_number_detector_unittest.cc',
         'renderer/bmp_image_decoder_unittest.cc',
         'renderer/date_time_formatter_unittest.cc',
         'renderer/disambiguation_popup_helper_unittest.cc',
         'renderer/gpu/input_event_filter_unittest.cc',
         'renderer/gpu/input_handler_proxy_unittest.cc',
         'renderer/hyphenator/hyphenator_unittest.cc',
         'renderer/ico_image_decoder_unittest.cc',
+        'renderer/media/android/media_info_loader_unittest.cc',
         'renderer/media/audio_message_filter_unittest.cc',
         'renderer/media/audio_renderer_mixer_manager_unittest.cc',
         'renderer/media/video_capture_impl_unittest.cc',
         'renderer/media/video_capture_message_filter_unittest.cc',
         'renderer/paint_aggregator_unittest.cc',
         'renderer/pepper/pepper_broker_impl_unittest.cc',
         'renderer/render_thread_impl_unittest.cc',
         'renderer/render_view_impl_unittest.cc',
         'renderer/v8_value_converter_impl_unittest.cc',
         'test/image_decoder_test.cc',
@@ skipping 117 matching lines @@
         '../webkit/browser/quota/mock_storage_client.h',
         '../webkit/browser/quota/quota_database_unittest.cc',
         '../webkit/browser/quota/quota_manager_unittest.cc',
         '../webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc',
         '../webkit/browser/quota/usage_tracker_unittest.cc',
         '../webkit/renderer/cpp_variant_unittest.cc',
         '../webkit/renderer/media/buffered_data_source_unittest.cc',
         '../webkit/renderer/media/buffered_resource_loader_unittest.cc',
         '../webkit/renderer/media/cache_util_unittest.cc',
         '../webkit/renderer/media/crypto/key_systems_unittest.cc',
-        '../webkit/renderer/media/media_info_loader_unittest.cc',
         '../webkit/renderer/media/test_response_generator.cc',
         '../webkit/renderer/media/test_response_generator.h',
         '../webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc',
         '../webkit/renderer/dom_storage/dom_storage_cached_area_unittest.cc',
         '../webkit/renderer/fileapi/webfilewriter_base_unittest.cc',
       ],
       'conditions': [
         ['OS == "ios"', {
           'sources/': [
             # iOS only needs a small portion of content; exclude all the
@@ skipping 665 matching lines @@
             'resource_dir': 'shell/android/shell_apk/res',
             'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }