Refactoring of Cast-related crypto code

extensions/extensions.gyp

Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 5e4c91db031fff40bb25d0f1ab7b8328930ad075..53a0c8b27c46c9b92b8de651a97986c4571da004 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -84,6 +84,8 @@
         '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,6 +283,36 @@
             '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',
+              ],
+            }],
+          ],
+        }],
+        ['OS != "linux"', {
+          'sources': [
+            'browser/api/audio/audio_service.cc',

[Ken Rockot(use gerrit already), 2015/01/05 23:16:07]

It looks like you're introducing a dependency on extensions/browser from within
extensions/common. That's no good, but it seems like it's probably just an
accidental move that came along with the openssl condition?

[sheretov, 2015/01/06 00:33:30]

Rebase/merge error.  Fixed.

+          ]
+        }],
       ],
     },
     {
@@ -815,37 +847,6 @@
             '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, ],