Network Setup from Shark to Remora.

chrome/browser/chromeos/login/helper.h

Index: chrome/browser/chromeos/login/helper.h
diff --git a/chrome/browser/chromeos/login/helper.h b/chrome/browser/chromeos/login/helper.h
index c02cd58908047dc554562f02f5c9bdc9377989ab..f25eec7b958931114acf61dcc622dd19a6bcd2c1 100644
--- a/chrome/browser/chromeos/login/helper.h
+++ b/chrome/browser/chromeos/login/helper.h
@@ -64,8 +64,11 @@ class NetworkStateHelper {
   // Ethernet > WiFi > Cellular. Same for connecting network.
   virtual base::string16 GetCurrentNetworkName() const;
 
-  // Add a network configuration.
-  virtual void CreateNetworkFromOnc(const std::string& onc_spec) const;
+  // Add and apply a network configuration. Used in shark/remora mode.
+  virtual void CreateAndConnectNetworkFromOnc(
+      const std::string& onc_spec,
+      const base::Closure& success_callback,
+      const base::Closure& error_callback) const;
 
   // Returns true if the default network is in connected state.
   virtual bool IsConnected() const;
@@ -74,8 +77,11 @@ class NetworkStateHelper {
   virtual bool IsConnecting() const;
 
  private:
-  void OnCreateConfiguration(const std::string& service_path) const;
-  void OnCreateConfigurationFailed(
+  void OnCreateConfiguration(const base::Closure& success_callback,
+                             const base::Closure& error_callback,
+                             const std::string& service_path) const;
+  void OnCreateOrConnectNetworkFailed(
+      const base::Closure& error_callback,
       const std::string& error_name,
       scoped_ptr<base::DictionaryValue> error_data) const;