Replace misc. network stub flags with more flexible ones

chromeos/dbus/fake_shill_manager_client.h

Index: chromeos/dbus/fake_shill_manager_client.h
diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h
index 65f449eb55262aa1e60afb0bd5b5b2ac919e6fb5..3de46c184388cf19c8c23e4ae3ba31aed748b610 100644
--- a/chromeos/dbus/fake_shill_manager_client.h
+++ b/chromeos/dbus/fake_shill_manager_client.h
@@ -17,8 +17,8 @@ namespace chromeos {
 // A fake implementation of ShillManagerClient. This works in close coordination
 // with FakeShillServiceClient. FakeShillDeviceClient, and
 // FakeShillProfileClient, and is not intended to be used independently.
-class CHROMEOS_EXPORT FakeShillManagerClient :
-      public ShillManagerClient,
+class CHROMEOS_EXPORT FakeShillManagerClient
+    : public ShillManagerClient,
       public ShillManagerClient::TestInterface {
  public:
   FakeShillManagerClient();
@@ -97,14 +97,15 @@ class CHROMEOS_EXPORT FakeShillManagerClient :
   virtual void RemoveManagerService(const std::string& service_path) OVERRIDE;
   virtual void ClearManagerServices() OVERRIDE;
   virtual void SortManagerServices() OVERRIDE;
+  virtual int GetInteractiveDelay() const OVERRIDE;
+  virtual std::string GetInitialState(const std::string& type) const OVERRIDE;
 
  private:
   void AddServiceToWatchList(const std::string& service_path);
   void SetDefaultProperties();
   void PassStubProperties(const DictionaryValueCallback& callback) const;
   void PassStubGeoNetworks(const DictionaryValueCallback& callback) const;
-  void CallNotifyObserversPropertyChanged(const std::string& property,
-                                          int delay_ms);
+  void CallNotifyObserversPropertyChanged(const std::string& property);
   void NotifyObserversPropertyChanged(const std::string& property);
   base::ListValue* GetListProperty(const std::string& property);
   bool TechnologyEnabled(const std::string& type) const;
@@ -115,11 +116,30 @@ class CHROMEOS_EXPORT FakeShillManagerClient :
   void ScanCompleted(const std::string& device_path,
                      const base::Closure& callback);
 
+  // Parses the command line for Shill stub switches and sets initial states.
+  void ParseCommandLineSwitch();
+  bool ParseOption(const std::string& arg0, const std::string& arg1);
+  bool SetInitialNetworkState(std::string type_arg, std::string state_arg);
+
+  // Sets up the default fake environment based on default initial states
+  // or states provided by the command line (see ParseCommandLineSwitch).
+  void SetupDefaultEnvironment();
+  std::string ParseInitialState(const std::string& type,
+                                bool* enabled,
+                                bool* portaled);
+
   // Dictionary of property name -> property value
   base::DictionaryValue stub_properties_;
+
   // Dictionary of technology -> list of property dictionaries
   base::DictionaryValue stub_geo_networks_;
 
+  // Seconds to delay interactive actions
+  int interactive_delay_;
+
+  // Initial state for fake services.
+  std::map<std::string, std::string> shill_initial_state_map_;
+
   ObserverList<ShillPropertyChangedObserver> observer_list_;
 
   // Note: This should remain the last member so it'll be destroyed and