Base infrastructure for Networking Private API on Windows and Mac.

chrome/chrome_browser_extensions.gypi

Index: chrome/chrome_browser_extensions.gypi
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 06136b96829a922437836a4c8f54a2f27ba73e87..ddc5bf2a34bc6ff1322a5435e056cc85475971a7 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -28,6 +28,7 @@
         'installer_util',
         'sync_file_system_proto',
         '../components/components.gyp:onc_component',
+        '../components/components.gyp:wifi_component',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth',
@@ -386,15 +387,6 @@
         'browser/extensions/api/music_manager_private/device_id_win.cc',
         'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
         'browser/extensions/api/music_manager_private/music_manager_private_api.h',
-        'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
-        'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
-        'browser/extensions/api/networking_private/networking_private_api.h',
-        'browser/extensions/api/networking_private/networking_private_crypto.cc',
-        'browser/extensions/api/networking_private/networking_private_crypto.h',
-        'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
-        'browser/extensions/api/networking_private/networking_private_event_router.h',
-        'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
-        'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
         'browser/extensions/api/notifications/notifications_api.cc',
         'browser/extensions/api/notifications/notifications_api.h',
         'browser/extensions/api/omnibox/omnibox_api.cc',
@@ -917,7 +909,6 @@
             'browser/extensions/api/audio/audio_service.cc',
             'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
             'browser/extensions/api/image_writer_private/operation_linux.cc',
-            'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
             'browser/extensions/api/system_display/display_info_provider_aura.cc',
             'browser/extensions/default_apps.cc',
             'browser/extensions/default_apps.h',
@@ -940,6 +931,12 @@
             'browser/extensions/api/log_private/syslog_parser.h',
             'browser/chromeos/extensions/screenlock_private_api.cc',
             'browser/chromeos/extensions/screenlock_private_api.h',
+            'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_api.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_event_router.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
             'browser/extensions/api/terminal/terminal_extension_helper.cc',
             'browser/extensions/api/terminal/terminal_extension_helper.h',
             'browser/extensions/api/terminal/terminal_private_api.cc',
@@ -982,6 +979,7 @@
             ['include', '^browser/extensions/api/messaging/message_property_provider.cc'],
             ['include', '^browser/extensions/api/messaging/message_service.cc'],
             ['include', '^browser/extensions/api/module/module.cc'],
+            ['include', '^browser/extensions/api/networking_private/.*\.cc'],
             ['include', '^browser/extensions/api/omnibox/omnibox_api.cc'],
             ['include', '^browser/extensions/api/preference/preference_api.cc'],
             ['include', '^browser/extensions/api/proxy/proxy_api.cc'],
@@ -1057,6 +1055,22 @@
           ],
         }],
         ['OS=="win"', {

[jam, 2013/11/21 19:01:30]

i don't think two OS=="win" sections is going to work? even if it does, there
should only be one.

Also, the convention for gypi files is that all files are listed in the main
section, and then files should be excluded per OS in the OS-specific conditions

[mef, 2013/11/21 21:15:50]

It appears that there could be multiple sections with same condition, but the CL
with mac implementation changes this section to be 'OS=="win" or OS=="mac"':
https://codereview.chromium.org/64683014/diff/50001/chrome/chrome_browser_ext...
Done.

+          'sources': [
+            'browser/extensions/api/networking_private/networking_private_api.h',
+            'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_crypto.cc',
+            'browser/extensions/api/networking_private/networking_private_crypto.h',
+            'browser/extensions/api/networking_private/networking_private_event_router.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_service_client.cc',
+            'browser/extensions/api/networking_private/networking_private_service_client.h',
+            'browser/extensions/api/networking_private/networking_private_service_client_factory.cc',
+            'browser/extensions/api/networking_private/networking_private_service_client_factory.h',
+          ],
+        }],
+        ['OS=="win"', {
           'dependencies': [
             'launcher_support',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',