Translate ONC ProxySettings <-> Shill ProxyConfig

chromeos/chromeos.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'chromeos_sources': [
       'accelerometer/accelerometer_reader.cc',
@@ skipping 527 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_prefs',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
         '../components/components.gyp:cloud_policy_proto',
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:onc_component',
+        '../components/components.gyp:proxy_config',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../url/url.gyp:url_lib',
         'cryptohome_proto',
         'ime/input_method.gyp:gencode',
         'power_manager_proto',
       ],
       'defines': [
         'CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [ '<@(chromeos_sources)' ],
     },
     {
       # GN version: //chromeos:test_support
       # This target contains mocks that can be used to write unit tests.
       'target_name': 'chromeos_test_support',
       'type': 'static_library',
       'dependencies': [
         '../build/linux/system.gyp:dbus',
+        '../google_apis/google_apis.gyp:google_apis_test_support',

[jochen (gone - plz use gerrit), 2015/07/08 13:20:15]

indent

[stevenjb, 2015/07/08 16:26:14]

huh?

         '../testing/gmock.gyp:gmock',
         'chromeos',
         'chromeos_test_support_without_gmock',
         'cryptohome_proto',
         'power_manager_proto',
       ],
       # If you edit the file list of this target, please edit BUILD.gn as well.
       'sources': [
         'attestation/mock_attestation_flow.cc',
         'attestation/mock_attestation_flow.h',
@@ skipping 77 matching lines @@
       # GN version: //chromeos:chromeos_unittests
       'target_name': 'chromeos_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:run_all_unittests',
         '../base/base.gyp:test_support_base',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
         '../components/components.gyp:onc_component',
+        '../components/components.gyp:proxy_config',
         '../crypto/crypto.gyp:crypto',
         '../crypto/crypto.gyp:crypto_test_support',
         '../dbus/dbus.gyp:dbus_test_support',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/icu/icu.gyp:icui18n',
@@ skipping 76 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'chromeos_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }