arc-bridge: Enable ARC with a command-line flag

components/components_tests.gyp

 # Copyright 2014 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 1353 matching lines @@
             'components.gyp:cryptauth_test_support',
             'components.gyp:feedback_component',
             'components.gyp:pref_registry_test_support',
             'components.gyp:proximity_auth',
             'components.gyp:proximity_auth_test_support',
             'components.gyp:webusb',
           ],
         }],
         ['chromeos==1', {
           'sources': [
+            'arc/arc_bridge_service_unittest.cc',
             'pairing/message_buffer_unittest.cc',
             'timers/alarm_timer_unittest.cc',
             'wifi_sync/wifi_config_delegate_chromeos_unittest.cc',
             'wifi_sync/wifi_credential_syncable_service_unittest.cc',
             'wifi_sync/wifi_credential_unittest.cc',
             'wifi_sync/wifi_security_class_chromeos_unittest.cc',
             'wifi_sync/wifi_security_class_unittest.cc',
             '<@(metrics_leak_detector_unittest_sources)',
             '<@(ownership_unittest_sources)',
           ],
           'sources!': [
             'signin/core/browser/signin_status_metrics_provider_unittest.cc',
             'storage_monitor/storage_monitor_linux_unittest.cc',
           ],
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos_test_support',
+            'components.gyp:arc',
             'components.gyp:metrics_leak_detector',
             'components.gyp:ownership',
             'components.gyp:pairing',
             'components.gyp:user_manager_test_support',
             'components.gyp:wifi_sync',
           ],
         }],
-        ['chromeos==1 and enable_arc==1', {
-          'sources': [
-            'arc/arc_bridge_service_unittest.cc',
-          ],
-          'dependencies': [
-            'components.gyp:arc',
-          ],
-        }],
         ['OS=="linux"', {
           'sources': [
             'metrics/serialization/serialization_utils_unittest.cc',
           ],
           'dependencies': [
             'components.gyp:metrics_serialization',
             '../dbus/dbus.gyp:dbus',
             '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
           ],
         }],
@@ skipping 437 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }