Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 337 insertions, 0 deletions

diff --git a/chromium/components/onc/onc_constants.h b/chromium/components/onc/onc_constants.h
new file mode 100644
index 00000000000..400b34092ea
--- /dev/null
+++ b/chromium/components/onc/onc_constants.h
@@ -0,0 +1,337 @@
+// Copyright 2013 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.
+#ifndef COMPONENTS_ONC_ONC_CONSTANTS_H_
+#define COMPONENTS_ONC_ONC_CONSTANTS_H_
+
+#include "components/onc/onc_export.h"
+
+// Constants for ONC properties.
+namespace onc {
+
+// Indicates from which source an ONC blob comes from.
+enum ONCSource {
+  ONC_SOURCE_NONE,
+  ONC_SOURCE_USER_IMPORT,
+  ONC_SOURCE_DEVICE_POLICY,
+  ONC_SOURCE_USER_POLICY,
+};
+
+// These keys are used to augment the dictionary resulting from merging the
+// different settings and policies.
+
+// The setting that Shill declared to be using. For example, if no policy and no
+// user setting exists, Shill might still report a property like network
+// security options or a SSID.
+ONC_EXPORT extern const char kAugmentationActiveSetting[];
+// The one of different setting sources (user/device policy, user/shared
+// settings) that has highest priority over the others.
+ONC_EXPORT extern const char kAugmentationEffectiveSetting[];
+ONC_EXPORT extern const char kAugmentationUnmanaged[];
+ONC_EXPORT extern const char kAugmentationUserPolicy[];
+ONC_EXPORT extern const char kAugmentationDevicePolicy[];
+ONC_EXPORT extern const char kAugmentationUserSetting[];
+ONC_EXPORT extern const char kAugmentationSharedSetting[];
+ONC_EXPORT extern const char kAugmentationUserEditable[];
+ONC_EXPORT extern const char kAugmentationDeviceEditable[];
+
+// This is no ONC key or value but used for logging only.
+// TODO(pneubeck): Remove.
+ONC_EXPORT extern const char kNetworkConfiguration[];
+
+// Common keys/values.
+ONC_EXPORT extern const char kRecommended[];
+ONC_EXPORT extern const char kRemove[];
+
+// Top Level Configuration
+namespace toplevel_config {
+ONC_EXPORT extern const char kCertificates[];
+ONC_EXPORT extern const char kEncryptedConfiguration[];
+ONC_EXPORT extern const char kNetworkConfigurations[];
+ONC_EXPORT extern const char kGlobalNetworkConfiguration[];
+ONC_EXPORT extern const char kType[];
+ONC_EXPORT extern const char kUnencryptedConfiguration[];
+}  // namespace toplevel_config
+
+// NetworkConfiguration.
+namespace network_config {
+ONC_EXPORT extern const char kCellular[];
+ONC_EXPORT extern const char kEthernet[];
+ONC_EXPORT extern const char kGUID[];
+ONC_EXPORT extern const char kIPConfigs[];
+ONC_EXPORT extern const char kName[];
+ONC_EXPORT extern const char kNameServers[];
+ONC_EXPORT extern const char kProxySettings[];
+ONC_EXPORT extern const char kSearchDomains[];
+ONC_EXPORT extern const char kServicePath[];
+ONC_EXPORT extern const char kConnectionState[];
+ONC_EXPORT extern const char kType[];
+ONC_EXPORT extern const char kVPN[];
+ONC_EXPORT extern const char kWiFi[];
+}  // namespace network_config
+
+namespace network_type {
+ONC_EXPORT extern const char kAllTypes[];
+ONC_EXPORT extern const char kCellular[];
+ONC_EXPORT extern const char kEthernet[];
+ONC_EXPORT extern const char kVPN[];
+ONC_EXPORT extern const char kWiFi[];
+}  // namespace network_type
+
+namespace cellular {
+ONC_EXPORT extern const char kActivateOverNonCellularNetwork[];
+ONC_EXPORT extern const char kActivationState[];
+ONC_EXPORT extern const char kAllowRoaming[];
+ONC_EXPORT extern const char kAPN[];
+ONC_EXPORT extern const char kAPNList[];
+ONC_EXPORT extern const char kCarrier[];
+ONC_EXPORT extern const char kESN[];
+ONC_EXPORT extern const char kFamily[];
+ONC_EXPORT extern const char kFirmwareRevision[];
+ONC_EXPORT extern const char kFoundNetworks[];
+ONC_EXPORT extern const char kHardwareRevision[];
+ONC_EXPORT extern const char kHomeProvider[];
+ONC_EXPORT extern const char kICCID[];
+ONC_EXPORT extern const char kIMEI[];
+ONC_EXPORT extern const char kIMSI[];
+ONC_EXPORT extern const char kManufacturer[];
+ONC_EXPORT extern const char kMDN[];
+ONC_EXPORT extern const char kMEID[];
+ONC_EXPORT extern const char kMIN[];
+ONC_EXPORT extern const char kModelID[];
+ONC_EXPORT extern const char kNetworkTechnology[];
+ONC_EXPORT extern const char kPRLVersion[];
+ONC_EXPORT extern const char kProviderRequiresRoaming[];
+ONC_EXPORT extern const char kRoamingState[];
+ONC_EXPORT extern const char kSelectedNetwork[];
+ONC_EXPORT extern const char kServingOperator[];
+ONC_EXPORT extern const char kSIMLockStatus[];
+ONC_EXPORT extern const char kSIMPresent[];
+ONC_EXPORT extern const char kSupportedCarriers[];
+ONC_EXPORT extern const char kSupportNetworkScan[];
+}  // namespace cellular
+
+namespace cellular_provider {
+ONC_EXPORT extern const char kCode[];
+ONC_EXPORT extern const char kCountry[];
+ONC_EXPORT extern const char kName[];
+}  // namespace cellular_provider
+
+namespace cellular_apn {
+ONC_EXPORT extern const char kName[];
+ONC_EXPORT extern const char kUsername[];
+ONC_EXPORT extern const char kPassword[];
+}  // namespace cellular_apn
+
+
+namespace connection_state {
+ONC_EXPORT extern const char kConnected[];
+ONC_EXPORT extern const char kConnecting[];
+ONC_EXPORT extern const char kNotConnected[];
+}  // namespace connection_state
+
+namespace ipconfig {
+ONC_EXPORT extern const char kGateway[];
+ONC_EXPORT extern const char kIPAddress[];
+ONC_EXPORT extern const char kIPv4[];
+ONC_EXPORT extern const char kIPv6[];
+ONC_EXPORT extern const char kRoutingPrefix[];
+ONC_EXPORT extern const char kType[];
+}  // namespace ipconfig
+
+namespace ethernet {
+ONC_EXPORT extern const char kAuthentication[];
+ONC_EXPORT extern const char kEAP[];
+ONC_EXPORT extern const char kNone[];
+ONC_EXPORT extern const char k8021X[];
+}  // namespace ethernet
+
+namespace wifi {
+ONC_EXPORT extern const char kAutoConnect[];
+ONC_EXPORT extern const char kBSSID[];
+ONC_EXPORT extern const char kEAP[];
+ONC_EXPORT extern const char kFrequency[];
+ONC_EXPORT extern const char kFrequencyList[];
+ONC_EXPORT extern const char kHiddenSSID[];
+ONC_EXPORT extern const char kNone[];
+ONC_EXPORT extern const char kPassphrase[];
+ONC_EXPORT extern const char kProxyURL[];
+ONC_EXPORT extern const char kSSID[];
+ONC_EXPORT extern const char kSecurity[];
+ONC_EXPORT extern const char kSignalStrength[];
+ONC_EXPORT extern const char kWEP_PSK[];
+ONC_EXPORT extern const char kWEP_8021X[];
+ONC_EXPORT extern const char kWPA_PSK[];
+ONC_EXPORT extern const char kWPA2_PSK[];
+ONC_EXPORT extern const char kWPA_EAP[];
+}  // namespace wifi
+
+namespace certificate {
+ONC_EXPORT extern const char kAuthority[];
+ONC_EXPORT extern const char kClient[];
+ONC_EXPORT extern const char kCommonName[];
+ONC_EXPORT extern const char kEmailAddress[];
+ONC_EXPORT extern const char kEnrollmentURI[];
+ONC_EXPORT extern const char kGUID[];
+ONC_EXPORT extern const char kIssuerCARef[];
+ONC_EXPORT extern const char kIssuerCAPEMs[];
+ONC_EXPORT extern const char kIssuer[];
+ONC_EXPORT extern const char kLocality[];
+ONC_EXPORT extern const char kNone[];
+ONC_EXPORT extern const char kOrganization[];
+ONC_EXPORT extern const char kOrganizationalUnit[];
+ONC_EXPORT extern const char kPKCS12[];
+ONC_EXPORT extern const char kPattern[];
+ONC_EXPORT extern const char kRef[];
+ONC_EXPORT extern const char kServer[];
+ONC_EXPORT extern const char kSubject[];
+ONC_EXPORT extern const char kTrustBits[];
+ONC_EXPORT extern const char kType[];
+ONC_EXPORT extern const char kWeb[];
+ONC_EXPORT extern const char kX509[];
+}  // namespace certificate
+
+namespace encrypted {
+ONC_EXPORT extern const char kAES256[];
+ONC_EXPORT extern const char kCipher[];
+ONC_EXPORT extern const char kCiphertext[];
+ONC_EXPORT extern const char kHMACMethod[];
+ONC_EXPORT extern const char kHMAC[];
+ONC_EXPORT extern const char kIV[];
+ONC_EXPORT extern const char kIterations[];
+ONC_EXPORT extern const char kPBKDF2[];
+ONC_EXPORT extern const char kSHA1[];
+ONC_EXPORT extern const char kSalt[];
+ONC_EXPORT extern const char kStretch[];
+}  // namespace encrypted
+
+namespace eap {
+ONC_EXPORT extern const char kAnonymousIdentity[];
+ONC_EXPORT extern const char kAutomatic[];
+ONC_EXPORT extern const char kClientCertPattern[];
+ONC_EXPORT extern const char kClientCertRef[];
+ONC_EXPORT extern const char kClientCertType[];
+ONC_EXPORT extern const char kEAP_AKA[];
+ONC_EXPORT extern const char kEAP_FAST[];
+ONC_EXPORT extern const char kEAP_SIM[];
+ONC_EXPORT extern const char kEAP_TLS[];
+ONC_EXPORT extern const char kEAP_TTLS[];
+ONC_EXPORT extern const char kIdentity[];
+ONC_EXPORT extern const char kInner[];
+ONC_EXPORT extern const char kLEAP[];
+ONC_EXPORT extern const char kMD5[];
+ONC_EXPORT extern const char kMSCHAPv2[];
+ONC_EXPORT extern const char kOuter[];
+ONC_EXPORT extern const char kPAP[];
+ONC_EXPORT extern const char kPEAP[];
+ONC_EXPORT extern const char kPassword[];
+ONC_EXPORT extern const char kSaveCredentials[];
+ONC_EXPORT extern const char kServerCAPEMs[];
+ONC_EXPORT extern const char kServerCARef[];
+ONC_EXPORT extern const char kServerCARefs[];
+ONC_EXPORT extern const char kUseSystemCAs[];
+}  // namespace eap
+
+namespace vpn {
+ONC_EXPORT extern const char kAutoConnect[];
+ONC_EXPORT extern const char kClientCertPattern[];
+ONC_EXPORT extern const char kClientCertRef[];
+ONC_EXPORT extern const char kClientCertType[];
+ONC_EXPORT extern const char kHost[];
+ONC_EXPORT extern const char kIPsec[];
+ONC_EXPORT extern const char kL2TP[];
+ONC_EXPORT extern const char kOpenVPN[];
+ONC_EXPORT extern const char kPassword[];
+ONC_EXPORT extern const char kSaveCredentials[];
+ONC_EXPORT extern const char kTypeL2TP_IPsec[];
+ONC_EXPORT extern const char kType[];
+ONC_EXPORT extern const char kUsername[];
+}  // namespace vpn
+
+namespace ipsec {
+ONC_EXPORT extern const char kAuthenticationType[];
+ONC_EXPORT extern const char kCert[];
+ONC_EXPORT extern const char kEAP[];
+ONC_EXPORT extern const char kGroup[];
+ONC_EXPORT extern const char kIKEVersion[];
+ONC_EXPORT extern const char kPSK[];
+ONC_EXPORT extern const char kServerCAPEMs[];
+ONC_EXPORT extern const char kServerCARef[];
+ONC_EXPORT extern const char kServerCARefs[];
+ONC_EXPORT extern const char kXAUTH[];
+}  // namespace ipsec
+
+namespace openvpn {
+ONC_EXPORT extern const char kAuthNoCache[];
+ONC_EXPORT extern const char kAuthRetry[];
+ONC_EXPORT extern const char kAuth[];
+ONC_EXPORT extern const char kCipher[];
+ONC_EXPORT extern const char kCompLZO[];
+ONC_EXPORT extern const char kCompNoAdapt[];
+ONC_EXPORT extern const char kInteract[];
+ONC_EXPORT extern const char kKeyDirection[];
+ONC_EXPORT extern const char kNoInteract[];
+ONC_EXPORT extern const char kNone[];
+ONC_EXPORT extern const char kNsCertType[];
+ONC_EXPORT extern const char kPort[];
+ONC_EXPORT extern const char kProto[];
+ONC_EXPORT extern const char kPushPeerInfo[];
+ONC_EXPORT extern const char kRemoteCertEKU[];
+ONC_EXPORT extern const char kRemoteCertKU[];
+ONC_EXPORT extern const char kRemoteCertTLS[];
+ONC_EXPORT extern const char kRenegSec[];
+ONC_EXPORT extern const char kServerCAPEMs[];
+ONC_EXPORT extern const char kServerCARef[];
+ONC_EXPORT extern const char kServerCARefs[];
+ONC_EXPORT extern const char kServerCertPEM[];
+ONC_EXPORT extern const char kServerCertRef[];
+ONC_EXPORT extern const char kServerPollTimeout[];
+ONC_EXPORT extern const char kServer[];
+ONC_EXPORT extern const char kShaper[];
+ONC_EXPORT extern const char kStaticChallenge[];
+ONC_EXPORT extern const char kTLSAuthContents[];
+ONC_EXPORT extern const char kTLSRemote[];
+ONC_EXPORT extern const char kVerb[];
+ONC_EXPORT extern const char kVerifyHash[];
+ONC_EXPORT extern const char kVerifyX509[];
+}  // namespace openvpn
+
+namespace verify_x509 {
+ONC_EXPORT extern const char kName[];
+ONC_EXPORT extern const char kType[];
+
+namespace types {
+ONC_EXPORT extern const char kName[];
+ONC_EXPORT extern const char kNamePrefix[];
+ONC_EXPORT extern const char kSubject[];
+}  // namespace types
+}  // namespace verify_x509
+
+namespace substitutes {
+ONC_EXPORT extern const char kEmailField[];
+ONC_EXPORT extern const char kLoginIDField[];
+}  // namespace substitutes
+
+namespace proxy {
+ONC_EXPORT extern const char kDirect[];
+ONC_EXPORT extern const char kExcludeDomains[];
+ONC_EXPORT extern const char kFtp[];
+ONC_EXPORT extern const char kHost[];
+ONC_EXPORT extern const char kHttp[];
+ONC_EXPORT extern const char kHttps[];
+ONC_EXPORT extern const char kManual[];
+ONC_EXPORT extern const char kPAC[];
+ONC_EXPORT extern const char kPort[];
+ONC_EXPORT extern const char kSocks[];
+ONC_EXPORT extern const char kType[];
+ONC_EXPORT extern const char kWPAD[];
+}  // namespace proxy
+
+namespace global_network_config {
+ONC_EXPORT extern const char kAllowOnlyPolicyNetworksToAutoconnect[];
+}  // global_network_config
+
+}  // namespace onc
+
+#endif  // COMPONENTS_ONC_ONC_CONSTANTS_H_
+