Replace OncNetworkParser by the new ONC translator.

chrome/browser/chromeos/cros/onc_network_parser.h

Index: chrome/browser/chromeos/cros/onc_network_parser.h
diff --git a/chrome/browser/chromeos/cros/onc_network_parser.h b/chrome/browser/chromeos/cros/onc_network_parser.h
deleted file mode 100644
index 9801e45f1507d64c7904ca0b3fd60c87aa5ea829..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/cros/onc_network_parser.h
+++ /dev/null
@@ -1,286 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_
-
-#include <string>
-#include <vector>
-
-#include "base/compiler_specific.h"  // for OVERRIDE
-#include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/values.h"
-#include "chrome/browser/chromeos/cros/network_parser.h"
-#include "chrome/browser/chromeos/cros/network_ui_data.h"
-#include "chromeos/network/onc/onc_constants.h"
-
-namespace base {
-class DictionaryValue;
-class ListValue;
-class Value;
-}
-
-namespace net {
-class ProxyServer;
-}
-
-namespace chromeos {
-
-class IssuerSubjectPattern;
-
-// This is a simple representation of the signature of an ONC typed
-// field, used in validation and translation.  It could be extended
-// to include more complex rules of when the field is required/optional,
-// as well as to handle "enum" types, which are strings with a small
-// static set of possible values.
-struct OncValueSignature {
-  const char* field;
-  PropertyIndex index;
-  base::Value::Type type;
-};
-
-// This is the network parser that parses the data from an Open Network
-// Configuration (ONC) file. ONC files are in JSON format that describes
-// networks. We will use this parser to parse the ONC JSON blob.
-//
-// For ONC file format, see: http://dev.chromium.org/chromium-os/
-//     chromiumos-design-docs/open-network-configuration
-class OncNetworkParser : public NetworkParser {
- public:
-  typedef bool (*ParserPointer)(OncNetworkParser*,
-                                PropertyIndex,
-                                const base::Value&,
-                                Network*);
-
-  OncNetworkParser(const base::ListValue& network_configs,
-                   onc::ONCSource onc_source);
-  virtual ~OncNetworkParser();
-  static const EnumMapper<PropertyIndex>* property_mapper();
-
-  // Returns the number of networks in the "NetworkConfigs" list.
-  int GetNetworkConfigsSize() const;
-
-  // Returns the network configuration dictionary for the nth network. CHECKs if
-  // |n| is out of range and returns NULL on parse errors.
-  const base::DictionaryValue* GetNetworkConfig(int n);
-
-  // Call to create the network by parsing network config in the nth position.
-  // (0-based). CHECKs if |n| is out of range and returns NULL on parse errors.
-  // |removed| is set to true if the network should be removed.  |removed| may
-  // be NULL.
-  Network* ParseNetwork(int n, bool* marked_for_removal);
-
-  virtual Network* CreateNetworkFromInfo(const std::string& service_path,
-      const base::DictionaryValue& info) OVERRIDE;
-
-  // Parses a nested ONC object with the given mapper and parser function.
-  // If Value is not the proper type or there is an error in parsing
-  // any individual field, VLOGs diagnostics, and returns false.
-  bool ParseNestedObject(Network* network,
-                         const std::string& onc_type,
-                         const base::Value& value,
-                         OncValueSignature* signature,
-                         ParserPointer parser);
-
-  // Expands |value| with user account specific paramaters.
-  static std::string GetUserExpandedValue(const base::Value& value,
-                                          onc::ONCSource source);
-
-  const std::string& parse_error() const { return parse_error_; }
-
-  onc::ONCSource onc_source() const { return onc_source_; }
-
- protected:
-  OncNetworkParser();
-
-  virtual Network* CreateNewNetwork(ConnectionType type,
-                                    const std::string& service_path) OVERRIDE;
-  virtual ConnectionType ParseType(const std::string& type) OVERRIDE;
-  virtual ConnectionType ParseTypeFromDictionary(
-      const base::DictionaryValue& info) OVERRIDE;
-
-  // Returns the type string from the dictionary of network values.
-  std::string GetTypeFromDictionary(const base::DictionaryValue& info);
-
-  // Returns the GUID string from the dictionary of network values.
-  std::string GetGuidFromDictionary(const base::DictionaryValue& info);
-
-  // Parse a field's value in the NetworkConfiguration object.
-  static bool ParseNetworkConfigurationValue(OncNetworkParser* parser,
-                                             PropertyIndex index,
-                                             const base::Value& value,
-                                             Network* network);
-
-  // Issue a diagnostic and return false if a type mismatch is found.
-  static bool CheckNetworkType(Network* network,
-                               ConnectionType expected,
-                               const std::string& onc_type);
-
-
-  // Find the PKCS#11 ID of the certificate with the given GUID.  Returns
-  // an empty string on failure.
-  static std::string GetPkcs11IdFromCertGuid(const std::string& guid);
-
-  // Process ProxySettings dictionary into a format which is then updated into
-  // ProxyConfig property in shill.
-  static bool ProcessProxySettings(OncNetworkParser* parser,
-                                   const base::Value& value,
-                                   Network* network);
-
-  static ClientCertType ParseClientCertType(const std::string& type);
-
-  // Parse ClientCertPattern dictionary that specifies certificate pattern for
-  // VPN and WiFi EAP certificates.
-  static bool ParseClientCertPattern(OncNetworkParser* parser,
-                                     PropertyIndex index,
-                                     const base::Value& value,
-                                     Network* network);
- private:
-  // Parse the ProxySettings dictionary.
-  static bool ParseProxySettingsValue(OncNetworkParser* parser,
-                                      PropertyIndex index,
-                                      const base::Value& value,
-                                      Network* network);
-
-  // Parse Type key of ProxySettings dictionary.
-  static ProxyOncType ParseProxyType(const std::string& type);
-
-  // Parse Manual dictionary that is child of ProxySettings dictionary.
-  static bool ParseProxyManualValue(OncNetworkParser* parser,
-                                    PropertyIndex index,
-                                    const base::Value& value,
-                                    Network* network);
-
-  // Parse proxy server for different schemes in Manual dictionary.
-  static bool ParseProxyServer(int property_index,
-                               const base::Value& value,
-                               const std::string& scheme,
-                               Network* network);
-
-  // Parse ProxyLocation dictionary that specifies the manual proxy server.
-  static net::ProxyServer ParseProxyLocationValue(int property_index,
-                                                  const base::Value& value);
-
-  // Parse IssuerSubjectPattern dictionary for certificate pattern fields.
-  static bool ParseIssuerPattern(OncNetworkParser* parser,
-                                 PropertyIndex index,
-                                 const base::Value& value,
-                                 Network* network);
-  static bool ParseSubjectPattern(OncNetworkParser* parser,
-                                  PropertyIndex index,
-                                  const base::Value& value,
-                                  Network* network);
-  static bool ParseIssuerSubjectPattern(IssuerSubjectPattern* pattern,
-                                        OncNetworkParser* parser,
-                                        PropertyIndex index,
-                                        const base::Value& value,
-                                        Network* network);
-
-  // Error message from the JSON parser, if applicable.
-  std::string parse_error_;
-
-  // Where the ONC blob comes from.
-  onc::ONCSource onc_source_;
-
-  scoped_ptr<base::ListValue> network_configs_;
-
-  DISALLOW_COPY_AND_ASSIGN(OncNetworkParser);
-};
-
-// Class for parsing Ethernet networks.
-class OncEthernetNetworkParser : public OncNetworkParser {
- public:
-  OncEthernetNetworkParser();
-  virtual ~OncEthernetNetworkParser();
-  static bool ParseEthernetValue(OncNetworkParser* parser,
-                                 PropertyIndex index,
-                                 const base::Value& value,
-                                 Network* ethernet_network);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(OncEthernetNetworkParser);
-};
-
-// Base for wireless networks.
-class OncWirelessNetworkParser : public OncNetworkParser {
- public:
-  OncWirelessNetworkParser();
-  virtual ~OncWirelessNetworkParser();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(OncWirelessNetworkParser);
-};
-
-// Class for parsing Wi-Fi networks.
-class OncWifiNetworkParser : public OncWirelessNetworkParser {
- public:
-  OncWifiNetworkParser();
-  virtual ~OncWifiNetworkParser();
-  static bool ParseWifiValue(OncNetworkParser* parser,
-                             PropertyIndex index,
-                             const base::Value& value,
-                             Network* wifi_network);
-
- protected:
-  static bool ParseEAPValue(OncNetworkParser* parser,
-                            PropertyIndex index,
-                            const base::Value& value,
-                            Network* wifi_network);
-  static ConnectionSecurity ParseSecurity(const std::string& security);
-  static EAPMethod ParseEAPMethod(const std::string& method);
-  static EAPPhase2Auth ParseEAPPhase2Auth(const std::string& auth);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(OncWifiNetworkParser);
-};
-
-// Class for parsing virtual private networks.
-class OncVirtualNetworkParser : public OncNetworkParser {
- public:
-  OncVirtualNetworkParser();
-  virtual ~OncVirtualNetworkParser();
-  virtual bool UpdateNetworkFromInfo(
-      const base::DictionaryValue& info, Network* network) OVERRIDE;
-  static bool ParseVPNValue(OncNetworkParser* parser,
-                            PropertyIndex index,
-                            const base::Value& value,
-                            Network* network);
-
-  // network_library combines provider type and authentication type
-  // (L2TP-IPsec with PSK vs with Certificates).  This function
-  // takes a provider type and adds an authentication type to return
-  // the updated provider type.
-  static ProviderType UpdateProviderTypeWithAuthType(
-      ProviderType provider,
-      const std::string& auth_type);
-
-  // This function takes a provider type (which includes authentication
-  // type) and returns the canonical provider type from it.  For instance
-  // for L2TP-IPsec, the PSK provider type is the canonical one.
-  static ProviderType GetCanonicalProviderType(ProviderType provider_type);
-
-  static ProviderType ParseProviderType(const std::string& type);
-
- protected:
-  static bool ParseIPsecValue(OncNetworkParser* parser,
-                              PropertyIndex index,
-                              const base::Value& value,
-                              Network* network);
-  static bool ParseL2TPValue(OncNetworkParser* parser,
-                             PropertyIndex index,
-                             const base::Value& value,
-                             Network* network);
-  static bool ParseOpenVPNValue(OncNetworkParser* parser,
-                                PropertyIndex index,
-                                const base::Value& value,
-                                Network* network);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(OncVirtualNetworkParser);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_