Refactoring of Cast-related crypto code

chrome/chrome_common.gypi

Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 75964335ab20db77b313b6789198dd6815231357..dbe17de2d4b5ada3d9faded65efe7c83b09fe4b6 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -250,16 +250,23 @@
       'common/service_process_util_win.cc',
     ],
     'chrome_common_win_mac_sources': [
-      'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
-      'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
-      'common/extensions/api/networking_private/networking_private_crypto.cc',
-      'common/extensions/api/networking_private/networking_private_crypto.h',
       'common/media_galleries/itunes_library.cc',
       'common/media_galleries/itunes_library.h',
       'common/media_galleries/picasa_types.cc',
       'common/media_galleries/picasa_types.h',
       'common/media_galleries/pmp_constants.h',
     ],
+    'chrome_common_networking_private_sources_openssl' : [
+      'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
+      'common/extensions/api/networking_private/networking_private_crypto.cc',
+      'common/extensions/api/networking_private/networking_private_crypto.h',
+    ],
+    'chrome_common_networking_private_sources_nss' : [
+      'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
+      'common/extensions/api/networking_private/networking_private_crypto.cc',
+      'common/extensions/api/networking_private/networking_private_crypto.h',
+    ],
+
     'chrome_common_mac_sources': [
       'common/media_galleries/iphoto_library.cc',
       'common/media_galleries/iphoto_library.h',
@@ -341,12 +348,15 @@
         ['OS=="win" or OS=="mac"', {
           'sources': [ '<@(chrome_common_win_mac_sources)' ],
         }],
-        ['(OS=="win" or OS=="mac") and use_openssl==1', {
-          # networking_private_crypto_openssl.cc depends on boringssl.
+        ['(OS=="win" or OS=="mac" or chromeos==1) and use_openssl==1', {

[Ryan Sleevi, 2014/12/15 21:42:59]

It's not entirely clear why the chromeos addition is correct here. Could you
explain?

[sheretov, 2014/12/16 08:44:20]

This CL moves ChromeOS to the same implementation of networkingPrivate crypto as
Windows and Mac.  Previously, ChromeOS had a different implementation that was
accessed through a D-Bus interface. The shared openssl (or nss) implementation
is contained in chrome_common_networking_private_sources_xxx.

+          'sources': [ '<@(chrome_common_networking_private_sources_openssl)' ],
           'dependencies': [
             '../third_party/boringssl/boringssl.gyp:boringssl',
           ],
         }],
+        ['(OS=="win" or OS=="mac" or chromeos==1) and use_openssl!=1', {
+          'sources': [ '<@(chrome_common_networking_private_sources_nss)' ],
+        }],
         ['OS=="mac"', {
           'sources': [ '<@(chrome_common_mac_sources)' ],
         }],
@@ -501,17 +511,6 @@
         ['safe_browsing==2', {
           'defines': [ 'MOBILE_SAFE_BROWSING' ],
         }],
-        ['use_openssl==1', {
-           'sources!': [
-             'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
-           ],
-         },
-         {  # else !use_openssl
-           'sources!': [
-             'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
-           ],
-         },
-        ],
       ],
       'target_conditions': [
         ['OS == "ios"', {