Revert of Refactoring of Cast-related crypto code

extensions/extensions.gyp

Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index d215a35603e31136a3527f815a83ecba0970eff0..47a19b4eb1a45e64044177fe855ecaa9f3ed3660 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -84,8 +84,6 @@
         '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',
@@ -281,31 +279,6 @@
           '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',
-              ],
-            }],
           ],
         }],
       ],
@@ -845,6 +818,32 @@
             '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',