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

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 067b266544bf2c04caca0c465a627f7908ec3bd2..0a0186e31ea6e5bb8a1dec782abd07e5daf6fb96 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1371,6 +1371,7 @@
         }],
         ['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',
@@ -1387,6 +1388,7 @@
           ],
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos_test_support',
+            'components.gyp:arc',
             'components.gyp:metrics_leak_detector',
             'components.gyp:ownership',
             'components.gyp:pairing',
@@ -1394,14 +1396,6 @@
             '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',