Shuffle media-related WebMimeRegistry code from webkit/ to content/.

net/net.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 1396 matching lines @@
               'base/openssl_private_key_store_memory.cc',
               'cert/cert_database_openssl.cc',
               'cert/cert_verify_proc_openssl.cc',
               'cert/test_root_certs_openssl.cc',
             ],
             # The net/android/keystore_openssl.cc source file needs to
             # access an OpenSSL-internal header.
             'include_dirs': [
               '../third_party/openssl',
             ],
-          }, {  # else OS != "android"
-            'defines': [
-              # These are the features Android doesn't support.
-              'ENABLE_MEDIA_CODEC_THEORA',
-            ],
           },
         ],
       ],
       'target_conditions': [
         # These source files are excluded by default platform rules, but they
         # are needed in specific cases on other platforms. Re-including them can
         # only be done in target_conditions as it is evaluated after the
         # platform rules.
         ['OS == "android"', {
           'sources/': [
@@ skipping 1510 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }