Revert of Refactoring of Cast-related crypto code

extensions/extensions.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,
   },
   'targets': [
     {
@@ skipping 66 matching lines @@
         'common/api/bluetooth/bluetooth_manifest_handler.h',
         'common/api/bluetooth/bluetooth_manifest_permission.cc',
         'common/api/bluetooth/bluetooth_manifest_permission.h',
         'common/api/messaging/message.h',
         'common/api/sockets/sockets_manifest_data.cc',
         'common/api/sockets/sockets_manifest_data.h',
         'common/api/sockets/sockets_manifest_handler.cc',
         'common/api/sockets/sockets_manifest_handler.h',
         'common/api/sockets/sockets_manifest_permission.cc',
         'common/api/sockets/sockets_manifest_permission.h',
-        'common/cast/cast_cert_validator.cc',
-        'common/cast/cast_cert_validator.h',
         'common/common_manifest_handlers.cc',
         'common/common_manifest_handlers.h',
         'common/csp_validator.cc',
         'common/csp_validator.h',
         'common/dom_action_types.h',
         'common/draggable_region.cc',
         'common/draggable_region.h',
         'common/error_utils.cc',
         'common/error_utils.h',
         'common/event_filter.cc',
@@ skipping 177 matching lines @@
       'msvs_disabled_warnings': [ 4267, ],
       'conditions': [
         ['disable_nacl==0', {
           # NaClModulesHandler does not use any code in NaCl, so no dependency
           # on nacl_common.
           'sources': [
             'common/manifest_handlers/nacl_modules_handler.cc',
             'common/manifest_handlers/nacl_modules_handler.h',
           ],
         }],
-        ['use_openssl==1', {
-          'sources': [
-            'common/cast/cast_cert_validator_openssl.cc',
-          ],
-          'dependencies': [
-            '../third_party/boringssl/boringssl.gyp:boringssl',
-          ],
-        }, {
-          'sources': [
-            'common/cast/cast_cert_validator_nss.cc',
-          ],
-          'conditions': [
-            ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-              'dependencies': [
-                '../build/linux/system.gyp:ssl',
-              ],
-            }],
-            ['OS == "mac" or OS == "ios" or OS == "win"', {
-              'dependencies': [
-                '../third_party/nss/nss.gyp:nspr',
-                '../third_party/nss/nss.gyp:nss',
-              ],
-            }],
-          ],
-        }],
       ],
     },
     {
       # GN version: //extensions/browser
       'target_name': 'extensions_browser',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_prefs',
         '../components/components.gyp:copresence_endpoints',
@@ skipping 517 matching lines @@
             '../chromeos/chromeos.gyp:chromeos',
           ],
           'sources': [
             'browser/api/vpn_provider/vpn_provider_api.cc',
             'browser/api/vpn_provider/vpn_provider_api.h',
             'browser/api/vpn_provider/vpn_service.cc',
             'browser/api/vpn_provider/vpn_service.h',
             'browser/api/vpn_provider/vpn_service_factory.h'
           ]
         }],
+        ['use_openssl==1', {
+          'sources': [
+            'browser/api/cast_channel/cast_auth_util_openssl.cc',
+          ],
+          'dependencies': [
+            '../third_party/boringssl/boringssl.gyp:boringssl',
+          ],
+        }, {
+          'sources': [
+            # cast_auth_util_nss.cc uses NSS functions.
+            'browser/api/cast_channel/cast_auth_util_nss.cc',
+          ],
+          'conditions': [
+            ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+              'dependencies': [
+                '../build/linux/system.gyp:ssl',
+              ],
+            }],
+            ['OS == "mac" or OS == "ios" or OS == "win"', {
+              'dependencies': [
+                '../third_party/nss/nss.gyp:nspr',
+                '../third_party/nss/nss.gyp:nss',
+              ],
+            }],
+          ],
+        }],
         ['OS != "linux"', {
           'sources': [
             'browser/api/audio/audio_service.cc',
           ]
         }],
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
@@ skipping 442 matching lines @@
       'conditions': [
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
   ]
 }