Move cros_network_functions.cc to src/chromeos

chromeos/network/cros_network_functions.h

Index: chromeos/network/cros_network_functions.h
diff --git a/chrome/browser/chromeos/cros/cros_network_functions.h b/chromeos/network/cros_network_functions.h
similarity index 50%
rename from chrome/browser/chromeos/cros/cros_network_functions.h
rename to chromeos/network/cros_network_functions.h
index ec3987e00e75fc68f7ca5104b0e5bf4cb6295807..b96485705f526c86339abf08f920a1a0223ece61 100644
--- a/chrome/browser/chromeos/cros/cros_network_functions.h
+++ b/chromeos/network/cros_network_functions.h
@@ -2,19 +2,24 @@
 // 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_CROS_NETWORK_FUNCTIONS_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_
+#ifndef CHROMEOS_NETWORK_CROS_NETWORK_FUNCTIONS_H_
+#define CHROMEOS_NETWORK_CROS_NETWORK_FUNCTIONS_H_
 
 // This header is introduced to make it easy to switch from chromeos_network.cc
 // to Chrome's own DBus code.  crosbug.com/16557
+//
 // All calls to functions in chromeos_network.h should be made through
 // functions provided by this header.
+//
+// DO NOT INCLUDE THIS HEADER DIRECTLY, THESE FUNCTIONS ARE BEING DEPRECATED.
+// Contact stevenjb@chromium.org and/or see crbug.com/154852
 
 #include <vector>
 
 #include "base/callback.h"
-#include "base/time.h"
-#include "chrome/browser/chromeos/cros/network_ip_config.h"
+#include "chromeos/chromeos_export.h"
+#include "chromeos/network/network_ip_config.h"
+#include "chromeos/network/network_util.h"
 
 namespace base {
 
@@ -25,27 +30,6 @@ class Value;
 
 namespace chromeos {
 
-// Describes whether there is an error and whether the error came from
-// the local system or from the server implementing the connect
-// method.
-enum NetworkMethodErrorType {
-  NETWORK_METHOD_ERROR_NONE = 0,
-  NETWORK_METHOD_ERROR_LOCAL = 1,
-  NETWORK_METHOD_ERROR_REMOTE = 2,
-};
-
-// Struct to represent a SMS.
-struct SMS {
-  SMS();
-  ~SMS();
-  base::Time timestamp;
-  std::string number;
-  std::string text;
-  std::string smsc;  // optional; empty if not present in message.
-  int32 validity;  // optional; -1 if not present in message.
-  int32 msgclass;  // optional; -1 if not present in message.
-};
-
 // Callback to be called when receiving a SMS.
 typedef base::Callback<void(const std::string& modem_device_path,
                             const SMS& message)> MonitorSMSCallback;
@@ -61,14 +45,8 @@ typedef base::Callback<void(
     const std::string& key,
     const base::Value& value)> NetworkPropertiesWatcherCallback;
 
-// Callback for methods that initiate an operation and return no data.
-typedef base::Callback<void(
-    const std::string& path,
-    NetworkMethodErrorType error,
-    const std::string& error_message)> NetworkOperationCallback;
-
 // Base class of signal watchers.
-class CrosNetworkWatcher {
+class CHROMEOS_EXPORT CrosNetworkWatcher {
  public:
   virtual ~CrosNetworkWatcher() {}
 
@@ -76,77 +54,70 @@ class CrosNetworkWatcher {
   CrosNetworkWatcher() {}
 };
 
-struct WifiAccessPoint {
-  WifiAccessPoint();
-
-  std::string mac_address;  // The mac address of the WiFi node.
-  std::string name;         // The SSID of the WiFi node.
-  base::Time timestamp;     // Timestamp when this AP was detected.
-  int signal_strength;      // Radio signal strength measured in dBm.
-  int signal_to_noise;      // Current signal to noise ratio measured in dB.
-  int channel;              // Wifi channel number.
-};
-
-typedef std::vector<WifiAccessPoint> WifiAccessPointVector;
-
 // Activates the cellular modem specified by |service_path| with carrier
 // specified by |carrier|.
 // |carrier| is NULL or an empty string, this will activate with the currently
 // active carrier.
 // Returns false on failure and true on success.
-bool CrosActivateCellularModem(const std::string& service_path,
-                               const std::string& carrier);
+CHROMEOS_EXPORT bool CrosActivateCellularModem(const std::string& service_path,
+                                               const std::string& carrier);
 
 
 // Sets a property of a service to the provided value.
 // Success is indicated by the receipt of a matching PropertyChanged signal.
-void CrosSetNetworkServiceProperty(const std::string& service_path,
-                                   const std::string& property,
-                                   const base::Value& value);
+CHROMEOS_EXPORT void CrosSetNetworkServiceProperty(
+    const std::string& service_path,
+    const std::string& property,
+    const base::Value& value);
 
 // Clears a property of a service.
-void CrosClearNetworkServiceProperty(const std::string& service_path,
-                                     const std::string& property);
+CHROMEOS_EXPORT void CrosClearNetworkServiceProperty(
+    const std::string& service_path,
+    const std::string& property);
 
 // Sets a property of a device to the provided value.
 // Success is indicated by the receipt of a matching PropertyChanged signal.
-void CrosSetNetworkDeviceProperty(const std::string& device_path,
-                                  const std::string& property,
-                                  const base::Value& value);
+CHROMEOS_EXPORT void CrosSetNetworkDeviceProperty(
+    const std::string& device_path,
+    const std::string& property,
+    const base::Value& value);
 
 // Sets a property of an ip config to the provided value.
 // Success is indicated by the receipt of a matching PropertyChanged signal.
-void CrosSetNetworkIPConfigProperty(const std::string& ipconfig_path,
-                                    const std::string& property,
-                                    const base::Value& value);
+CHROMEOS_EXPORT void CrosSetNetworkIPConfigProperty(
+    const std::string& ipconfig_path,
+    const std::string& property,
+    const base::Value& value);
 
 // Sets a property of a manager to the provided value.
 // Success is indicated by the receipt of a matching PropertyChanged signal.
-void CrosSetNetworkManagerProperty(const std::string& property,
-                                   const base::Value& value);
+CHROMEOS_EXPORT void CrosSetNetworkManagerProperty(const std::string& property,
+                                                   const base::Value& value);
 
 // Deletes a remembered service from a profile.
-void CrosDeleteServiceFromProfile(const std::string& profile_path,
-                                  const std::string& service_path);
+CHROMEOS_EXPORT void CrosDeleteServiceFromProfile(
+    const std::string& profile_path,
+    const std::string& service_path);
 
 // Sets up monitoring of the PropertyChanged signal on the shill manager.
 // The provided |callback| will be called whenever a manager property changes.
-CrosNetworkWatcher* CrosMonitorNetworkManagerProperties(
+CHROMEOS_EXPORT CrosNetworkWatcher* CrosMonitorNetworkManagerProperties(
     const NetworkPropertiesWatcherCallback& callback);
 
 // Similar to MonitorNetworkManagerProperties for a specified network service.
-CrosNetworkWatcher* CrosMonitorNetworkServiceProperties(
+CHROMEOS_EXPORT CrosNetworkWatcher* CrosMonitorNetworkServiceProperties(
     const NetworkPropertiesWatcherCallback& callback,
     const std::string& service_path);
 
 // Similar to MonitorNetworkManagerProperties for a specified network device.
-CrosNetworkWatcher* CrosMonitorNetworkDeviceProperties(
+CHROMEOS_EXPORT CrosNetworkWatcher* CrosMonitorNetworkDeviceProperties(
     const NetworkPropertiesWatcherCallback& callback,
     const std::string& device_path);
 
 // Similar to MonitorNetworkManagerProperties for a specified network device.
-CrosNetworkWatcher* CrosMonitorSMS(const std::string& modem_device_path,
-                                   MonitorSMSCallback callback);
+CHROMEOS_EXPORT CrosNetworkWatcher* CrosMonitorSMS(
+    const std::string& modem_device_path,
+    MonitorSMSCallback callback);
 
 // Connects to the service with the |service_path|.
 // Service parameters such as authentication must already be configured.
@@ -154,106 +125,116 @@ CrosNetworkWatcher* CrosMonitorSMS(const std::string& modem_device_path,
 // the connection process has started. You will have to query the
 // connection state to determine if the connection was established
 // successfully.
-void CrosRequestNetworkServiceConnect(const std::string& service_path,
-                                      const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosRequestNetworkServiceConnect(
+    const std::string& service_path,
+    const NetworkOperationCallback& callback);
 
 // Retrieves the latest info for the manager.
-void CrosRequestNetworkManagerProperties(
+CHROMEOS_EXPORT void CrosRequestNetworkManagerProperties(
     const NetworkPropertiesCallback& callback);
 
 // Retrieves the latest info for a service.
-void CrosRequestNetworkServiceProperties(
+CHROMEOS_EXPORT void CrosRequestNetworkServiceProperties(
     const std::string& service_path,
     const NetworkPropertiesCallback& callback);
 
 // Retrieves the latest info for a particular device.
-void CrosRequestNetworkDeviceProperties(
+CHROMEOS_EXPORT void CrosRequestNetworkDeviceProperties(
     const std::string& device_path,
     const NetworkPropertiesCallback& callback);
 
 // Retrieves the list of remembered services for a profile.
-void CrosRequestNetworkProfileProperties(
+CHROMEOS_EXPORT void CrosRequestNetworkProfileProperties(
     const std::string& profile_path,
     const NetworkPropertiesCallback& callback);
 
 // Retrieves the latest info for a profile service entry.
-void CrosRequestNetworkProfileEntryProperties(
+CHROMEOS_EXPORT void CrosRequestNetworkProfileEntryProperties(
     const std::string& profile_path,
     const std::string& profile_entry_path,
     const NetworkPropertiesCallback& callback);
 
 // Requests a wifi service not in the network list (i.e. hidden).
-void CrosRequestHiddenWifiNetworkProperties(
+CHROMEOS_EXPORT void CrosRequestHiddenWifiNetworkProperties(
     const std::string& ssid,
     const std::string& security,
     const NetworkPropertiesCallback& callback);
 
 // Requests a new VPN service.
-void CrosRequestVirtualNetworkProperties(
+CHROMEOS_EXPORT void CrosRequestVirtualNetworkProperties(
     const std::string& service_name,
     const std::string& server_hostname,
     const std::string& provider_type,
     const NetworkPropertiesCallback& callback);
 
 // Disconnects from network service asynchronously.
-void CrosRequestNetworkServiceDisconnect(const std::string& service_path);
+CHROMEOS_EXPORT void CrosRequestNetworkServiceDisconnect(
+    const std::string& service_path);
 
 // Removes an exisiting network service (e.g. after forgetting a VPN).
-void CrosRequestRemoveNetworkService(const std::string& service_path);
+CHROMEOS_EXPORT void CrosRequestRemoveNetworkService(
+    const std::string& service_path);
 
 // Requests a scan of services of |type|.
 // |type| should be is a string recognized by shill's Manager API.
-void CrosRequestNetworkScan(const std::string& network_type);
+CHROMEOS_EXPORT void CrosRequestNetworkScan(const std::string& network_type);
 
 // Requests enabling or disabling a device.
-void CrosRequestNetworkDeviceEnable(const std::string& network_type,
-                                    bool enable);
+CHROMEOS_EXPORT void CrosRequestNetworkDeviceEnable(
+    const std::string& network_type,
+    bool enable);
 
 // Enables or disables PIN protection for a SIM card.
-void CrosRequestRequirePin(const std::string& device_path,
-                           const std::string& pin,
-                           bool enable,
-                           const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosRequestRequirePin(
+    const std::string& device_path,
+    const std::string& pin,
+    bool enable,
+    const NetworkOperationCallback& callback);
 
 // Enters a PIN to unlock a SIM card.
-void CrosRequestEnterPin(const std::string& device_path,
-                         const std::string& pin,
-                         const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosRequestEnterPin(
+    const std::string& device_path,
+    const std::string& pin,
+    const NetworkOperationCallback& callback);
 
 // Enters a PUK to unlock a SIM card whose PIN has been entered
 // incorrectly too many times. A new |pin| must be supplied
 // along with the |unblock_code| (PUK).
-void CrosRequestUnblockPin(const std::string& device_path,
-                           const std::string& unblock_code,
-                           const std::string& pin,
-                           const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosRequestUnblockPin(
+    const std::string& device_path,
+    const std::string& unblock_code,
+    const std::string& pin,
+    const NetworkOperationCallback& callback);
 
 // Changes the PIN used to unlock a SIM card.
-void CrosRequestChangePin(const std::string& device_path,
-                          const std::string& old_pin,
-                          const std::string& new_pin,
-                          const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosRequestChangePin(
+    const std::string& device_path,
+    const std::string& old_pin,
+    const std::string& new_pin,
+    const NetworkOperationCallback& callback);
 
 // Proposes to trigger a scan transaction. For cellular networks scan result
 // is set in the property Cellular.FoundNetworks.
-void CrosProposeScan(const std::string& device_path);
+CHROMEOS_EXPORT void CrosProposeScan(const std::string& device_path);
 
 // Initiates registration on the network specified by network_id, which is in
 // the form MCCMNC. If the network ID is the empty string, then switch back to
 // automatic registration mode before initiating registration.
-void CrosRequestCellularRegister(const std::string& device_path,
-                                 const std::string& network_id,
-                                 const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosRequestCellularRegister(
+    const std::string& device_path,
+    const std::string& network_id,
+    const NetworkOperationCallback& callback);
 
 // Enables or disables the specific network device for connection.
 // Set offline mode. This will turn off all radios.
 // Returns false on failure and true on success.
-bool CrosSetOfflineMode(bool offline);
+CHROMEOS_EXPORT bool CrosSetOfflineMode(bool offline);
 
 // Gets a list of all the NetworkIPConfigs using a given device path,
 // and returns the information via callback.
-void CrosListIPConfigs(const std::string& device_path,
-                       const NetworkGetIPConfigsCallback& callback);
+CHROMEOS_EXPORT void CrosListIPConfigs(
+    const std::string& device_path,
+    const NetworkGetIPConfigsCallback& callback);
 
 // DEPRECATED, DO NOT USE: Use the asynchronous CrosListIPConfigs, above,
 // instead.
@@ -261,14 +242,16 @@ void CrosListIPConfigs(const std::string& device_path,
 // Optionally, you can get ipconfig-paths and the hardware address. Pass NULL as
 // |ipconfig_paths| and |hardware_address| if you are not interested in these
 // values.
-bool CrosListIPConfigsAndBlock(const std::string& device_path,
-                               NetworkIPConfigVector* ipconfig_vector,
-                               std::vector<std::string>* ipconfig_paths,
-                               std::string* hardware_address);
+CHROMEOS_EXPORT bool CrosListIPConfigsAndBlock(
+    const std::string& device_path,
+    NetworkIPConfigVector* ipconfig_vector,
+    std::vector<std::string>* ipconfig_paths,
+    std::string* hardware_address);
 
 // Refreshes the IP config |ipconfig_path| to pick up changes in
 // configuration, and renew the DHCP lease, if any.
-void CrosRequestIPConfigRefresh(const std::string& ipconfig_path);
+CHROMEOS_EXPORT void CrosRequestIPConfigRefresh(
+    const std::string& ipconfig_path);
 
 // Reads out the results of the last wifi scan. These results are not
 // pre-cached in the library, so the call may block whilst the results are
@@ -276,25 +259,17 @@ void CrosRequestIPConfigRefresh(const std::string& ipconfig_path);
 // Returns false if an error occurred in reading the results. Note that
 // a true return code only indicates the result set was successfully read,
 // it does not imply a scan has successfully completed yet.
-bool CrosGetWifiAccessPoints(WifiAccessPointVector* result);
+CHROMEOS_EXPORT bool CrosGetWifiAccessPoints(WifiAccessPointVector* result);
 
 // Configures the network service specified by |properties|.
-void CrosConfigureService(const base::DictionaryValue& properties);
-
-// Converts a |prefix_length| to a netmask. (for IPv4 only)
-// e.g. a |prefix_length| of 24 is converted to a netmask of "255.255.255.0".
-// Invalid prefix lengths will return the empty string.
-std::string CrosPrefixLengthToNetmask(int32 prefix_length);
-
-// Converts a |netmask| to a prefixlen. (for IPv4 only)
-// e.g. a |netmask| of 255.255.255.0 is converted to a prefixlen of 24
-int32 CrosNetmaskToPrefixLength(const std::string& netmask);
+CHROMEOS_EXPORT void CrosConfigureService(
+    const base::DictionaryValue& properties);
 
 // Changes the active cellular carrier.
-void CrosSetCarrier(const std::string& device_path,
-                    const std::string& carrier,
-                    const NetworkOperationCallback& callback);
+CHROMEOS_EXPORT void CrosSetCarrier(const std::string& device_path,
+                                    const std::string& carrier,
+                                    const NetworkOperationCallback& callback);
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_
+#endif  // CHROMEOS_NETWORK_CROS_NETWORK_FUNCTIONS_H_