Merge FavoriteState into NetworkState

chrome/browser/chromeos/net/onc_utils.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_NET_ONC_UTILS_H_
 #define CHROME_BROWSER_CHROMEOS_NET_ONC_UTILS_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "components/onc/onc_constants.h"
 
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
 
-class FavoriteState;
 class NetworkState;
 class User;
 
 namespace onc {
 
 // Translates |onc_proxy_settings|, which has to be a valid ONC ProxySettings
 // dictionary, to a ProxyConfig dictionary (see
 // chrome/browser/prefs/proxy_config_dictionary.h).
 //
 // This function is used to translate ONC ProxySettings to the "ProxyConfig"
@@ skipping 23 matching lines @@
 
 // Returns the global network configuration section of the active user's network
 // policy (if |for_active_user| is true) or of the device policy.
 const base::DictionaryValue* GetGlobalConfigFromPolicy(bool for_active_user);
 
 // Convenvience function to retrieve the "AllowOnlyPolicyNetworksToAutoconnect"
 // setting from the global network configuration (see
 // GetGlobalConfigFromPolicy).
 bool PolicyAllowsOnlyPolicyNetworksToAutoconnect(bool for_active_user);
 
-// Returns the effective (user or device) policy for network |favorite|. Both
+// Returns the effective (user or device) policy for network |network|. Both
 // |profile_prefs| and |local_state_prefs| might be NULL. Returns NULL if no
 // applicable policy is found. Sets |onc_source| accordingly.
-const base::DictionaryValue* GetPolicyForFavoriteNetwork(
+const base::DictionaryValue* GetPolicyForNetwork(
     const PrefService* profile_prefs,
     const PrefService* local_state_prefs,
-    const FavoriteState& favorite,
+    const NetworkState& network,
     ::onc::ONCSource* onc_source);
 
 // Convenience function to check only whether a policy for a network exists.
-bool HasPolicyForFavoriteNetwork(const PrefService* profile_prefs,
-                                 const PrefService* local_state_prefs,
-                                 const FavoriteState& network);
+bool HasPolicyForNetwork(const PrefService* profile_prefs,
+                         const PrefService* local_state_prefs,
+                         const NetworkState& network);
 
 }  // namespace onc
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_ONC_UTILS_H_