Several updates to canPlayType() results for EME

content/content_tests.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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 230 matching lines @@
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui',
         '../webkit/support/webkit_support.gyp:user_agent',
       ],
       'include_dirs': [
         '..',
+        '<(SHARED_INTERMEDIATE_DIR)',  # Needed by key_systems_unittest.cc.
       ],
       'sources': [
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
         'browser/accessibility/browser_accessibility_manager_unittest.cc',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
         'browser/debugger/devtools_http_handler_unittest.cc',
@@ skipping 187 matching lines @@
         '../webkit/fileapi/syncable/local_file_sync_status_unittest.cc',
         '../webkit/fileapi/syncable/syncable_file_system_unittest.cc',
         '../webkit/fileapi/syncable/syncable_file_system_util_unittest.cc',
         '../webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc',
         '../webkit/fileapi/test_file_set.cc',
         '../webkit/fileapi/test_file_set.h',
         '../webkit/fileapi/webfilewriter_base_unittest.cc',
         '../webkit/media/buffered_data_source_unittest.cc',
         '../webkit/media/buffered_resource_loader_unittest.cc',
         '../webkit/media/cache_util_unittest.cc',
+        '../webkit/media/crypto/key_systems_unittest.cc',
         '../webkit/media/crypto/proxy_decryptor_unittest.cc',
         '../webkit/media/test_response_generator.cc',
         '../webkit/media/test_response_generator.h',
         '../webkit/mocks/mock_weburlloader.cc',
         '../webkit/mocks/mock_weburlloader.h',
         '../webkit/plugins/npapi/plugin_lib_unittest.cc',
         '../webkit/plugins/npapi/plugin_list_unittest.cc',
         '../webkit/plugins/npapi/plugin_utils_unittest.cc',
         '../webkit/plugins/npapi/webplugin_impl_unittest.cc',
         '../webkit/quota/mock_quota_manager.cc',
@@ skipping 480 matching lines @@
             'resource_dir': '../res',
             'additional_src_dirs': ['../content/public/android/javatests/'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }