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

chrome/browser/chromeos/cros/network_library_impl_base.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_NETWORK_LIBRARY_IMPL_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
 
 #include <list>
 #include <set>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chromeos/network/onc/onc_constants.h"
 
 namespace chromeos {
 
 class NetworkLoginObserver;
 
 class NetworkLibraryImplBase : public NetworkLibrary {
  public:
   NetworkLibraryImplBase();
   virtual ~NetworkLibraryImplBase();
 
@@ skipping 14 matching lines @@
   // Calls ConnectToVirtualNetworkUsingConnectData if network request succeeds.
   virtual void CallRequestVirtualNetworkAndConnect(
       const std::string& service_name,
       const std::string& server_hostname,
       ProviderType provider_type) = 0;
   // Call to configure a wifi service. The identifier is either a service_path
   // or a GUID. |info| is a dictionary of property values.
   virtual void CallConfigureService(const std::string& identifier,
                                     const DictionaryValue* info) = 0;
   // Called from NetworkConnectStart.
-  // Calls NetworkConnectCompleted when the connection attept completes.
+  // Calls NetworkConnectCompleted when the connection attempt completes.
   virtual void CallConnectToNetwork(Network* network) = 0;
   // Called from DeleteRememberedNetwork.
   virtual void CallDeleteRememberedNetwork(
       const std::string& profile_path, const std::string& service_path) = 0;
 
   // Called from Enable*NetworkDevice.
   // Asynchronously enables or disables the specified device type.
   virtual void CallEnableNetworkDeviceType(
       ConnectionType device, bool enable) = 0;
 
@@ skipping 169 matching lines @@
   virtual void EnableWifiNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableMobileNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableWimaxNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE;
   // virtual EnableOfflineMode implemented in derived classes.
   // virtual GetIPConfigs implemented in derived classes.
   // virtual SetIPConfig implemented in derived classes.
   virtual void SwitchToPreferredNetwork() OVERRIDE;
   virtual bool LoadOncNetworks(const std::string& onc_blob,
                                const std::string& passphrase,
-                               NetworkUIData::ONCSource source,
-                               bool allow_web_trust_from_policy,
-                               std::string* error) OVERRIDE;
+                               onc::ONCSource source,
+                               bool allow_web_trust_from_policy) OVERRIDE;
   virtual bool SetActiveNetwork(ConnectionType type,
                                 const std::string& service_path) OVERRIDE;
 
  protected:
   typedef ObserverList<NetworkObserver> NetworkObserverList;
   typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap;
 
   typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList;
   typedef std::map<std::string, NetworkDeviceObserverList*>
       NetworkDeviceObserverMap;
 
   typedef std::map<std::string, Network*> NetworkMap;
   typedef std::map<std::string, int> PriorityMap;
   typedef std::map<std::string, NetworkDevice*> NetworkDeviceMap;
   typedef std::map<std::string, const base::DictionaryValue*> NetworkOncMap;
-  typedef std::map<NetworkUIData::ONCSource,
+  typedef std::map<onc::ONCSource,
                    std::set<std::string> > NetworkSourceMap;
 
   struct NetworkProfile {
     NetworkProfile(const std::string& p, NetworkProfileType t);
     ~NetworkProfile();
     std::string path;
     NetworkProfileType type;
     typedef std::set<std::string> ServiceList;
     ServiceList services;
   };
@@ skipping 45 matching lines @@
   // Network list management functions.
   void ClearActiveNetwork(ConnectionType type);
   void UpdateActiveNetwork(Network* network);
   void AddNetwork(Network* network);
   void DeleteNetwork(Network* network);
 
   // Calls ForgetNetwork for remembered wifi and virtual networks based on id.
   // When |if_found| is true, then it forgets networks that appear in |ids|.
   // When |if_found| is false, it removes networks that do NOT appear in |ids|.
   // |source| is the import source of the data.
-  void ForgetNetworksById(NetworkUIData::ONCSource source,
+  void ForgetNetworksById(onc::ONCSource source,
                           std::set<std::string> ids,
                           bool if_found);
 
   // Checks whether |network| has meanwhile been pruned by ONC policy. If so,
   // instructs shill to remove the network, deletes |network| and returns
   // false.
   bool ValidateRememberedNetwork(Network* network);
 
   // Adds |network| to the remembered networks data structures and returns true
   // if ValidateRememberedNetwork(network) returns true. Returns false
@@ skipping 155 matching lines @@
   // stray networks that shill still has on file, but are not known on the
   // Chrome side.
   NetworkSourceMap network_source_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_