Replace misc. network stub flags with more flexible ones

chromeos/chromeos_switches.cc

 // 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.
 
 #include "chromeos/chromeos_switches.h"
 
 namespace chromeos {
 namespace switches {
 
 // Path for app's OEM manifest file.
 const char kAppOemManifestFile[]            = "app-mode-oem-manifest";
 
 // When wallpaper boot animation is not disabled this switch
 // is used to override OOBE/sign in WebUI init type.
 // Possible values: parallel|postpone. Default: parallel.
 const char kAshWebUIInit[]                  = "ash-webui-init";
 
 // Enables overriding the path for the default authentication extension.
 const char kAuthExtensionPath[]             = "auth-ext-path";
 
 // Forces the stub implementation of dbus clients.
 const char kDbusStub[] = "dbus-stub";
 
-// All stub networks are idle by default.
-const char kDefaultStubNetworkStateIdle[] = "default-stub-network-state-idle";
-
 // Time before a machine at OOBE is considered derelict
 const char kDerelictDetectionTimeout[] = "derelict-detection-timeout";
 
 // Time before a derelict machines starts demo mode.
 const char kDerelictIdleTimeout[] = "derelict-idle-timeout";
 
+// Integer flag that sets the DeviceRegistered local state pref.
+const char kDeviceRegistered[]              = "device-registered";
+
 // Disables wallpaper boot animation (except of OOBE case).
 const char kDisableBootAnimation[]          = "disable-boot-animation";
 
 // Disables the ChromeOS demo.
 const char kDisableDemoMode[]               = "disable-demo-mode";
 
 // Disables reporting recently logged in users for enterprise-managed devices.
 const char kDisableEnterpriseUserReporting[] =
     "disable-enterprise-user-reporting";
 
@@ skipping 43 matching lines @@
 // certain hosted applications.
 const char kEnableBackgroundLoader[]        = "enable-background-loader";
 
 // Enables switching between different cellular carriers from the UI.
 const char kEnableCarrierSwitching[]        = "enable-carrier-switching";
 
 // Enables notifications about captive portals in session.
 const char kEnableNetworkPortalNotification[] =
     "enable-network-portal-notification";
 
-// Enable "interactive" mode for stub implemenations (e.g. NetworkStateHandler)
-const char kEnableStubInteractive[] = "enable-stub-interactive";
-
-// Enable stub portalled wifi network for testing.
-const char kEnableStubPortalledWifi[] = "enable-stub-portalled-wifi";
-
 // Enables touchpad three-finger-click as middle button.
 const char kEnableTouchpadThreeFingerClick[]
     = "enable-touchpad-three-finger-click";
 
-// Specifies stub network types to be enabled.  If this switch is not specified,
-// ethernet, wifi and vpn are enabled by default.
-//
-// Examples:
-// Disable all network types: --enabled-stub-network-types=''
-// Enable wifi only: --enabled-stub-network-types=wifi
-// Enable ethernet and wifi: --enabled-stub-network-types=ethernet,wifi
-const char kEnabledStubNetworkTypes[] = "enabled-stub-network-types";
-
 // Enable Kiosk mode for ChromeOS. Note this switch refers to retail mode rather
 // than the kiosk app mode.
 const char kEnableKioskMode[]               = "enable-kiosk-mode";
 
 // Enables request of tablet site (via user agent override).
 const char kEnableRequestTabletSite[]       = "enable-request-tablet-site";
 
 // Power of the power-of-2 initial modulus that will be used by the
 // auto-enrollment client. E.g. "4" means the modulus will be 2^4 = 16.
 const char kEnterpriseEnrollmentInitialModulus[] =
@@ skipping 52 matching lines @@
 
 // Specifies the user which is already logged in.
 const char kLoginUser[]                     = "login-user";
 
 // Enables natural scroll by default.
 const char kNaturalScrollDefault[]          = "enable-natural-scroll-default";
 
 // Skips all other OOBE pages after user login.
 const char kOobeSkipPostLogin[]             = "oobe-skip-postlogin";
 
-// Integer flag that sets the DeviceRegistered local state pref.
-const char kDeviceRegistered[]              = "device-registered";
+// Specifies power stub behavior:
+//  'cycle=2' - Cycles power states every 2 seconds.
+// See FakeDBusThreadManager::ParsePowerCommandLineSwitch for full details.
+const char kPowerStub[] = "power-stub";
+
+// Specifies network stub behavior. If this switch is not specified,
+// ethernet, wifi and vpn are enabled by default, and transitions occur
+// instantaneously. Multiple options can be comma separated (no spaces).
+// See FakeDBusThreadManager::ParseShillCommandLineSwitch for full details.
+// Examples:
+//  'wifi=off' - Wifi networks are all initially disconnected
+//  'wifi=disabled' - Wifi is initially disabled
+//  'wifi=none' - Wifi is unavailable
+//  'wifi=portal' - Wifi connection will be in Portal state
+//  'cellular' - Cellular is initially connected
+//  'interactive=3' - Interactive mode, connect/scan/etc requests take 3 secs
+const char kShillStub[] = "shill-stub";
 
 // Skips the machine hwid check. Useful for running in VMs because they have no
 // hwid.
 const char kSkipHWIDCheck[]                 = "skip-hwid-check";
 
 // Sends test messages on first call to RequestUpdate (stub only).
 const char kSmsTestMessages[]               = "sms-test-messages";
 
 // Indicates that a stub implementation of CrosSettings that stores settings in
 // memory without signing should be used, treating current user as the owner.
@@ skipping 19 matching lines @@
 const char kForceFirstRunUI[] = "force-first-run-ui";
 
 // Enables testing for auto update UI.
 const char kTestAutoUpdateUI[] = "test-auto-update-ui";
 
 // Enables features required for supervised user sync,
 const char kEnableSupervisedPasswordSync[] = "enable-supervised-password-sync";
 
 }  // namespace switches
 }  // namespace chromeos