This moves the ONC parsing code into chromeos/network/onc

chrome/browser/chromeos/cros/onc_network_parser.h

 // 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;
 }
@@ skipping 20 matching lines @@
 // 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,
-                   NetworkUIData::ONCSource onc_source);
+                   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);
 
@@ skipping 10 matching lines @@
   // 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,
-                                          NetworkUIData::ONCSource source);
+                                          onc::ONCSource source);
 
   const std::string& parse_error() const { return parse_error_; }
 
-  NetworkUIData::ONCSource onc_source() const { return onc_source_; }
+  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;
 
@@ skipping 71 matching lines @@
   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.
-  NetworkUIData::ONCSource onc_source_;
+  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();
@@ skipping 81 matching lines @@
                                 const base::Value& value,
                                 Network* network);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OncVirtualNetworkParser);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_