Revert 113120 - this CL broke then chromeos clang bot:

chrome/browser/chromeos/cros/network_library.h

 // Copyright (c) 2011 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 CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 72 matching lines @@
   PROPERTY_INDEX_FIRMWARE_REVISION,
   PROPERTY_INDEX_FOUND_NETWORKS,
   PROPERTY_INDEX_GUID,
   PROPERTY_INDEX_HARDWARE_REVISION,
   PROPERTY_INDEX_HIDDEN_SSID,
   PROPERTY_INDEX_HOME_PROVIDER,
   PROPERTY_INDEX_HOST,
   PROPERTY_INDEX_IDENTITY,
   PROPERTY_INDEX_IMEI,
   PROPERTY_INDEX_IMSI,
-  PROPERTY_INDEX_IPSEC_AUTHENTICATIONTYPE,
-  PROPERTY_INDEX_IPSEC_IKEVERSION,
   PROPERTY_INDEX_IS_ACTIVE,
   PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS,
   PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_ID,
   PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_SLOT,
   PROPERTY_INDEX_L2TPIPSEC_PASSWORD,
   PROPERTY_INDEX_L2TPIPSEC_PIN,
   PROPERTY_INDEX_L2TPIPSEC_PSK,
   PROPERTY_INDEX_L2TPIPSEC_USER,
   PROPERTY_INDEX_L2TPIPSEC_GROUP_NAME,
   PROPERTY_INDEX_MANUFACTURER,
   PROPERTY_INDEX_MDN,
   PROPERTY_INDEX_MEID,
   PROPERTY_INDEX_MIN,
   PROPERTY_INDEX_MODE,
   PROPERTY_INDEX_MODEL_ID,
   PROPERTY_INDEX_NAME,
   PROPERTY_INDEX_NETWORKS,
   PROPERTY_INDEX_NETWORK_TECHNOLOGY,
   PROPERTY_INDEX_OFFLINE_MODE,
-  PROPERTY_INDEX_OLP,
-  PROPERTY_INDEX_ONC_CLIENT_CERT_PATTERN,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_CLIENT_CERT_REF,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_CLIENT_CERT_TYPE,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_IPSEC,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_L2TP,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_OPENVPN,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_REMOVE,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_WIFI,  // Used internally for ONC parsing
-  PROPERTY_INDEX_ONC_VPN,  // Used internally for ONC parsing
-  PROPERTY_INDEX_OPEN_VPN_AUTH,
-  PROPERTY_INDEX_OPEN_VPN_AUTHRETRY,
-  PROPERTY_INDEX_OPEN_VPN_AUTHNOCACHE,
-  PROPERTY_INDEX_OPEN_VPN_AUTHUSERPASS,
-  PROPERTY_INDEX_OPEN_VPN_CACERT,
-  PROPERTY_INDEX_OPEN_VPN_CERT,
-  PROPERTY_INDEX_OPEN_VPN_CIPHER,
-  PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID,
-  PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_SLOT,
-  PROPERTY_INDEX_OPEN_VPN_COMPLZO,
-  PROPERTY_INDEX_OPEN_VPN_COMPNOADAPT,
-  PROPERTY_INDEX_OPEN_VPN_KEYDIRECTION,
-  PROPERTY_INDEX_OPEN_VPN_MGMT_ENABLE,
-  PROPERTY_INDEX_OPEN_VPN_NSCERTTYPE,
-  PROPERTY_INDEX_OPEN_VPN_OTP,
-  PROPERTY_INDEX_OPEN_VPN_PASSWORD,
-  PROPERTY_INDEX_OPEN_VPN_PIN,
-  PROPERTY_INDEX_OPEN_VPN_PORT,
-  PROPERTY_INDEX_OPEN_VPN_PROTO,
-  PROPERTY_INDEX_OPEN_VPN_PKCS11_PROVIDER,
-  PROPERTY_INDEX_OPEN_VPN_PUSHPEERINFO,
-  PROPERTY_INDEX_OPEN_VPN_REMOTECERTEKU,
-  PROPERTY_INDEX_OPEN_VPN_REMOTECERTKU,
-  PROPERTY_INDEX_OPEN_VPN_REMOTECERTTLS,
-  PROPERTY_INDEX_OPEN_VPN_RENEGSEC,
-  PROPERTY_INDEX_OPEN_VPN_SERVERPOLLTIMEOUT,
-  PROPERTY_INDEX_OPEN_VPN_SHAPER,
-  PROPERTY_INDEX_OPEN_VPN_STATICCHALLENGE,
-  PROPERTY_INDEX_OPEN_VPN_TLSAUTHCONTENTS,
-  PROPERTY_INDEX_OPEN_VPN_TLSREMOTE,
-  PROPERTY_INDEX_OPEN_VPN_USER,
   PROPERTY_INDEX_OPERATOR_CODE,
   PROPERTY_INDEX_OPERATOR_NAME,
   PROPERTY_INDEX_PASSPHRASE,
   PROPERTY_INDEX_PASSPHRASE_REQUIRED,
   PROPERTY_INDEX_PORTAL_URL,
   PROPERTY_INDEX_POWERED,
   PROPERTY_INDEX_PRIORITY,
-  PROPERTY_INDEX_PROVIDER_HOST,
-  PROPERTY_INDEX_PROVIDER_TYPE,
   PROPERTY_INDEX_PRL_VERSION,
   PROPERTY_INDEX_PROFILE,
   PROPERTY_INDEX_PROFILES,
   PROPERTY_INDEX_PROVIDER,
   PROPERTY_INDEX_PROXY_CONFIG,
+  PROPERTY_INDEX_REMOVE,
   PROPERTY_INDEX_ROAMING_STATE,
   PROPERTY_INDEX_SAVE_CREDENTIALS,
   PROPERTY_INDEX_SCANNING,
   PROPERTY_INDEX_SECURITY,
   PROPERTY_INDEX_SELECTED_NETWORK,
   PROPERTY_INDEX_SERVICES,
   PROPERTY_INDEX_SERVICE_WATCH_LIST,
   PROPERTY_INDEX_SERVING_OPERATOR,
   PROPERTY_INDEX_SIGNAL_STRENGTH,
   PROPERTY_INDEX_SIM_LOCK,
   PROPERTY_INDEX_SSID,
   PROPERTY_INDEX_STATE,
   PROPERTY_INDEX_SUPPORT_NETWORK_SCAN,
   PROPERTY_INDEX_TECHNOLOGY_FAMILY,
   PROPERTY_INDEX_TYPE,
   PROPERTY_INDEX_UI_DATA,
   PROPERTY_INDEX_UNKNOWN,
   PROPERTY_INDEX_USAGE_URL,
-  PROPERTY_INDEX_VPN_DOMAIN,
+  PROPERTY_INDEX_OLP,
+  PROPERTY_INDEX_OPEN_VPN_USER,
+  PROPERTY_INDEX_OPEN_VPN_PASSWORD,
+  PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID,
   PROPERTY_INDEX_WIFI_AUTH_MODE,
   PROPERTY_INDEX_WIFI_FREQUENCY,
   PROPERTY_INDEX_WIFI_HEX_SSID,
   PROPERTY_INDEX_WIFI_HIDDEN_SSID,
-  PROPERTY_INDEX_WIFI_PHY_MODE
+  PROPERTY_INDEX_WIFI_PHY_MODE,
 };
 
 // Connection enums (see flimflam/include/service.h)
 enum ConnectionType {
   TYPE_UNKNOWN   = 0,
   TYPE_ETHERNET  = 1,
   TYPE_WIFI      = 2,
   TYPE_WIMAX     = 3,
   TYPE_BLUETOOTH = 4,
   TYPE_CELLULAR  = 5,
@@ skipping 502 matching lines @@
             state == STATE_IDLE ||
             state == STATE_DISCONNECT ||
             state == STATE_FAILURE ||
             state == STATE_ACTIVATION_FAILURE);
   }
 
   virtual bool UpdateStatus(const std::string& key,
                             const base::Value& value,
                             PropertyIndex* index);
 
-  // Retrieves a property from the property_map_.  If |value| is NULL,
-  // just returns whether or not the given property was found.
-  bool GetProperty(PropertyIndex index, const base::Value** value) const;
-
  protected:
   Network(const std::string& service_path,
           ConnectionType type);
 
   NetworkParser* network_parser() { return network_parser_.get(); }
   void SetNetworkParser(NetworkParser* parser);
 
   // Updates property_map_ for the corresponding property index.
   void UpdatePropertyMap(PropertyIndex index, const base::Value& value);
 
@@ skipping 29 matching lines @@
 
   // This allows NetworkParser and its subclasses access to device
   // privates so that they can be reconstituted during parsing.  The
   // parsers only access things through the private set_ functions so
   // that this class can evolve without having to change all the
   // parsers.
   friend class NetworkParser;
   friend class NativeNetworkParser;
   friend class NativeVirtualNetworkParser;
   friend class OncNetworkParser;
-  friend class OncWifiNetworkParser;
   friend class OncVirtualNetworkParser;
 
   // This allows the implementation classes access to privates.
   NETWORK_LIBRARY_IMPL_FRIENDS;
 
   // Use these functions at your peril.  They are used by the various
   // parsers to set state, and really shouldn't be used by anything else
   // because they don't do the error checking and sending to the
   // network layer that the other setters do.
   void set_device_path(const std::string& device_path) {
@@ skipping 1022 matching lines @@
                                 const std::string& service_path) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_