Replace misc. network stub flags with more flexible ones

chromeos/dbus/shill_manager_client.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 CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 50 matching lines @@
     virtual void AddManagerService(const std::string& service_path,
                                    bool add_to_visible_list,
                                    bool add_to_watch_list) = 0;
     virtual void RemoveManagerService(const std::string& service_path) = 0;
     virtual void ClearManagerServices() = 0;
 
     // Called by ShillServiceClient when a service's State property changes.
     // Services are sorted first by Active vs. Inactive State, then by Type.
     virtual void SortManagerServices() = 0;
 
+    // Returns the interactive delay specified on the command line, 0 for none.
+    virtual int GetInteractiveDelay() const = 0;
+
+    // Returns the initial state value for the default network matching |type|.
+    // Note: these do not map directly to Service.State values, see
+    // FakeShillManagerClient::ParseOption for details. Defaults to
+    // shill::kStateOffline (unavailable).
+    virtual std::string GetInitialState(const std::string& type) const = 0;
+
    protected:
     virtual ~TestInterface() {}
   };
 
   // Properties used to verify the origin device.
   struct VerificationProperties {
     VerificationProperties();
     ~VerificationProperties();
 
     // A string containing a PEM-encoded X.509 certificate for use in verifying
@@ skipping 129 matching lines @@
   // Create() should be used instead.
   ShillManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShillManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_