Split DBus constants per daemon.

The service_constants.h file defines the DBus method names, property
names, signal names, property values and other DBus string constants
that define the API from Chromium to the Chromium OS system. It was
also the main way daemons in Chromium OS could talk to other daemons,
by sending DBus method calls using the method and interface names
defined here.

We are moving towards generated proxies for DBus communication packaged
in client libraries. Each daemon should expose a client library use to
talk to that daemon. The code generated from the .xml description
covers the interface names, methods names and property names, but
doesn't include property values and other required constants involved
in the interface but not expressed in the .xml file.

This patch splits the DBus constants used by Chromium and other daemons
in one file per daemon, that will eventually be part of the client
library presented by that daemon.

CQ-DEPEND=CL:295757
BUG=b:23560718
TEST=emerge-link system_api update_engine

Change-Id: I726633454ef248d280e0a21c534da6c42b1d53ab
Reviewed-on: https://chromium-review.googlesource.com/295756
Commit-Ready: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>

11 files changed, 1316 insertions, 1226 deletions

diff --git a/dbus/apmanager/dbus-constants.h b/dbus/apmanager/dbus-constants.h
new file mode 100644
index 0000000..ace31da
--- /dev/null
+++ b/dbus/apmanager/dbus-constants.h
@@ -0,0 +1,52 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_APMANAGER_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_APMANAGER_DBUS_CONSTANTS_H_
+
+namespace apmanager {
+const char kServiceName[] = "org.chromium.apmanager";
+const char kManagerInterface[] = "org.chromium.apmanager.Manager";
+const char kManagerPath[] = "/manager";
+const char kManagerError[] = "org.chromium.apmanager.Manager.Error";
+const char kServiceInterface[] = "org.chromium.apmanager.Service";
+const char kServiceError[] = "org.chromium.apmanager.Service.Error";
+const char kConfigInterface[] = "org.chromium.apmanager.Config";
+const char kConfigError[] = "org.chromium.apmanager.Config.Error";
+const char kClientInterface[] = "org.chromium.apmanager.Client";
+const char kDeviceInterface[] = "org.chromium.apmanager.Device";
+
+// Manager Methods.
+const char kCreateServiceMethod[] = "CreateService";
+const char kRemoveServiceMethod[] = "RemoveService";
+
+// Config Properties.
+const char kConfigSSIDProperty[] = "Ssid";
+const char kConfigInterfaceNameProperty[] = "InterfaceName";
+const char kConfigSecurityModeProperty[] = "SecurityMode";
+const char kConfigPassphraseProperty[] = "Passphrase";
+const char kConfigHwModeProperty[] = "HwMode";
+const char kConfigOperationModeProperty[] = "OperationMode";
+const char kConfigChannelProperty[] = "Channel";
+const char kConfigHiddenNetworkProperty[] = "HiddenNetwork";
+const char kConfigBridgeInterfaceProperty[] = "BridgeInterface";
+const char kConfigServerAddressIndexProperty[] = "ServerAddressIndex";
+
+// Security modes.
+const char kSecurityModeNone[] = "none";
+const char kSecurityModeRSN[] = "rsn";
+
+// Hardware modes.
+const char kHwMode80211a[] = "802.11a";
+const char kHwMode80211b[] = "802.11b";
+const char kHwMode80211g[] = "802.11g";
+const char kHwMode80211n[] = "802.11n";
+const char kHwMode80211ac[] = "802.11ac";
+
+// Operation modes.
+const char kOperationModeServer[] = "server";
+const char kOperationModeBridge[] = "bridge";
+}  // namespace apmanager
+
+#endif  // SYSTEM_API_DBUS_APMANAGER_DBUS_CONSTANTS_H_
diff --git a/dbus/cros-disks/dbus-constants.h b/dbus/cros-disks/dbus-constants.h
new file mode 100644
index 0000000..c58af38
--- /dev/null
+++ b/dbus/cros-disks/dbus-constants.h
@@ -0,0 +1,119 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_CROS_DISKS_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_CROS_DISKS_DBUS_CONSTANTS_H_
+
+namespace cros_disks {
+const char kCrosDisksInterface[] = "org.chromium.CrosDisks";
+const char kCrosDisksServicePath[] = "/org/chromium/CrosDisks";
+const char kCrosDisksServiceName[] = "org.chromium.CrosDisks";
+const char kCrosDisksServiceError[] = "org.chromium.CrosDisks.Error";
+
+// Methods.
+const char kEnumerateAutoMountableDevices[] = "EnumerateAutoMountableDevices";
+const char kEnumerateMountEntries[] = "EnumerateMountEntries";
+const char kFormat[] = "Format";
+const char kGetDeviceProperties[] = "GetDeviceProperties";
+const char kMount[] = "Mount";
+const char kUnmount[] = "Unmount";
+
+// Signals.
+const char kDeviceAdded[] = "DeviceAdded";
+const char kDeviceScanned[] = "DeviceScanned";
+const char kDeviceRemoved[] = "DeviceRemoved";
+const char kDiskAdded[] = "DiskAdded";
+const char kDiskChanged[] = "DiskChanged";
+const char kDiskRemoved[] = "DiskRemoved";
+const char kFormatCompleted[] = "FormatCompleted";
+const char kMountCompleted[] = "MountCompleted";
+
+// Properties.
+// TODO(benchan): Rename 'DeviceIs*' property to 'DiskIs*' as the latter is more
+// accurate.
+const char kDeviceFile[] = "DeviceFile";
+const char kDeviceIsDrive[] = "DeviceIsDrive";
+const char kDeviceIsMediaAvailable[] = "DeviceIsMediaAvailable";
+const char kDeviceIsMounted[] = "DeviceIsMounted";
+const char kDeviceIsOnBootDevice[] = "DeviceIsOnBootDevice";
+const char kDeviceIsOnRemovableDevice[] = "DeviceIsOnRemovableDevice";
+const char kDeviceIsReadOnly[] = "DeviceIsReadOnly";
+const char kDeviceIsVirtual[] = "DeviceIsVirtual";
+const char kDeviceMediaType[] = "DeviceMediaType";
+const char kDeviceMountPaths[] = "DeviceMountPaths";
+const char kDevicePresentationHide[] = "DevicePresentationHide";
+const char kDeviceSize[] = "DeviceSize";
+const char kDriveIsRotational[] = "DriveIsRotational";
+const char kDriveModel[] = "DriveModel";
+const char kExperimentalFeaturesEnabled[] = "ExperimentalFeaturesEnabled";
+const char kIdLabel[] = "IdLabel";
+const char kIdUuid[] = "IdUuid";
+const char kVendorId[] = "VendorId";
+const char kVendorName[] = "VendorName";
+const char kProductId[] = "ProductId";
+const char kProductName[] = "ProductName";
+const char kNativePath[] = "NativePath";
+
+// Enum values.
+// DeviceMediaType enum values are reported through UMA.
+// All values but DEVICE_MEDIA_NUM_VALUES should not be changed or removed.
+// Additional values can be added but DEVICE_MEDIA_NUM_VALUES should always
+// be the last value in the enum.
+enum DeviceMediaType {
+  DEVICE_MEDIA_UNKNOWN = 0,
+  DEVICE_MEDIA_USB = 1,
+  DEVICE_MEDIA_SD = 2,
+  DEVICE_MEDIA_OPTICAL_DISC = 3,
+  DEVICE_MEDIA_MOBILE = 4,
+  DEVICE_MEDIA_DVD = 5,
+  DEVICE_MEDIA_NUM_VALUES,
+};
+
+enum FormatErrorType {
+  FORMAT_ERROR_NONE = 0,
+  FORMAT_ERROR_UNKNOWN = 1,
+  FORMAT_ERROR_INTERNAL = 2,
+  FORMAT_ERROR_INVALID_DEVICE_PATH = 3,
+  FORMAT_ERROR_DEVICE_BEING_FORMATTED = 4,
+  FORMAT_ERROR_UNSUPPORTED_FILESYSTEM = 5,
+  FORMAT_ERROR_FORMAT_PROGRAM_NOT_FOUND = 6,
+  FORMAT_ERROR_FORMAT_PROGRAM_FAILED = 7,
+  FORMAT_ERROR_DEVICE_NOT_ALLOWED = 8,
+};
+
+// TODO(benchan): After both Chrome and cros-disks use these enum values,
+// make these error values contiguous so that they can be directly reported
+// via UMA.
+enum MountErrorType {
+  MOUNT_ERROR_NONE = 0,
+  MOUNT_ERROR_UNKNOWN = 1,
+  MOUNT_ERROR_INTERNAL = 2,
+  MOUNT_ERROR_INVALID_ARGUMENT = 3,
+  MOUNT_ERROR_INVALID_PATH = 4,
+  MOUNT_ERROR_PATH_ALREADY_MOUNTED = 5,
+  MOUNT_ERROR_PATH_NOT_MOUNTED = 6,
+  MOUNT_ERROR_DIRECTORY_CREATION_FAILED = 7,
+  MOUNT_ERROR_INVALID_MOUNT_OPTIONS = 8,
+  MOUNT_ERROR_INVALID_UNMOUNT_OPTIONS = 9,
+  MOUNT_ERROR_INSUFFICIENT_PERMISSIONS = 10,
+  MOUNT_ERROR_MOUNT_PROGRAM_NOT_FOUND = 11,
+  MOUNT_ERROR_MOUNT_PROGRAM_FAILED = 12,
+  MOUNT_ERROR_INVALID_DEVICE_PATH = 100,
+  MOUNT_ERROR_UNKNOWN_FILESYSTEM = 101,
+  MOUNT_ERROR_UNSUPPORTED_FILESYSTEM = 102,
+  MOUNT_ERROR_INVALID_ARCHIVE = 201,
+  MOUNT_ERROR_UNSUPPORTED_ARCHIVE = 202,
+};
+
+// MountSourceType enum values are solely used by Chrome/CrosDisks in
+// the MountCompleted signal, and currently not reported through UMA.
+enum MountSourceType {
+  MOUNT_SOURCE_INVALID = 0,
+  MOUNT_SOURCE_REMOVABLE_DEVICE = 1,
+  MOUNT_SOURCE_ARCHIVE = 2,
+  MOUNT_SOURCE_NETWORK_STORAGE = 3,
+};
+}  // namespace cros_disks
+
+#endif  // SYSTEM_API_DBUS_CROS_DISKS_DBUS_CONSTANTS_H_
diff --git a/dbus/cryptohome/dbus-constants.h b/dbus/cryptohome/dbus-constants.h
new file mode 100644
index 0000000..44f8ff7
--- /dev/null
+++ b/dbus/cryptohome/dbus-constants.h
@@ -0,0 +1,137 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_CRYPTOHOME_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_CRYPTOHOME_DBUS_CONSTANTS_H_
+
+namespace cryptohome {
+const char kCryptohomeInterface[] = "org.chromium.CryptohomeInterface";
+const char kCryptohomeServicePath[] = "/org/chromium/Cryptohome";
+const char kCryptohomeServiceName[] = "org.chromium.Cryptohome";
+// Methods
+const char kCryptohomeAsyncAddKey[] = "AsyncAddKey";
+const char kCryptohomeCheckKey[] = "CheckKey";
+const char kCryptohomeMigrateKey[] = "MigrateKey";
+const char kCryptohomeRemove[] = "Remove";
+const char kCryptohomeGetSystemSalt[] = "GetSystemSalt";
+const char kCryptohomeGetSanitizedUsername[] = "GetSanitizedUsername";
+const char kCryptohomeIsMounted[] = "IsMounted";
+const char kCryptohomeMount[] = "Mount";
+const char kCryptohomeMountGuest[] = "MountGuest";
+const char kCryptohomeMountPublic[] = "MountPublic";
+const char kCryptohomeUnmount[] = "Unmount";
+const char kCryptohomeTpmIsReady[] = "TpmIsReady";
+const char kCryptohomeTpmIsEnabled[] = "TpmIsEnabled";
+const char kCryptohomeTpmIsOwned[] = "TpmIsOwned";
+const char kCryptohomeTpmIsBeingOwned[] = "TpmIsBeingOwned";
+const char kCryptohomeTpmGetPassword[] = "TpmGetPassword";
+const char kCryptohomeTpmCanAttemptOwnership[] = "TpmCanAttemptOwnership";
+const char kCryptohomeTpmClearStoredPassword[] = "TpmClearStoredPassword";
+const char kCryptohomePkcs11GetTpmTokenInfo[] = "Pkcs11GetTpmTokenInfo";
+const char kCryptohomePkcs11GetTpmTokenInfoForUser[] =
+    "Pkcs11GetTpmTokenInfoForUser";
+const char kCryptohomePkcs11IsTpmTokenReady[] = "Pkcs11IsTpmTokenReady";
+const char kCryptohomePkcs11IsTpmTokenReadyForUser[] =
+    "Pkcs11IsTpmTokenReadyForUser";
+const char kCryptohomeAsyncCheckKey[] = "AsyncCheckKey";
+const char kCryptohomeAsyncMigrateKey[] = "AsyncMigrateKey";
+const char kCryptohomeAsyncMount[] = "AsyncMount";
+const char kCryptohomeAsyncMountGuest[] = "AsyncMountGuest";
+const char kCryptohomeAsyncMountPublic[] = "AsyncMountPublic";
+const char kCryptohomeAsyncRemove[] = "AsyncRemove";
+const char kCryptohomeGetStatusString[] = "GetStatusString";
+const char kCryptohomeRemoveTrackedSubdirectories[] =
+    "RemoveTrackedSubdirectories";
+const char kCryptohomeAsyncRemoveTrackedSubdirectories[] =
+    "AsyncRemoveTrackedSubdirectories";
+const char kCryptohomeDoAutomaticFreeDiskSpaceControl[] =
+    "DoAutomaticFreeDiskSpaceControl";
+const char kCryptohomeAsyncDoAutomaticFreeDiskSpaceControl[] =
+    "AsyncDoAutomaticFreeDiskSpaceControl";
+const char kCryptohomeAsyncDoesUsersExist[] = "AsyncDoesUsersExist";
+const char kCryptohomeInstallAttributesGet[] = "InstallAttributesGet";
+const char kCryptohomeInstallAttributesSet[] = "InstallAttributesSet";
+const char kCryptohomeInstallAttributesCount[] = "InstallAttributesCount";
+const char kCryptohomeInstallAttributesFinalize[] =
+    "InstallAttributesFinalize";
+const char kCryptohomeInstallAttributesIsReady[] = "InstallAttributesIsReady";
+const char kCryptohomeInstallAttributesIsSecure[] =
+    "InstallAttributesIsSecure";
+const char kCryptohomeInstallAttributesIsInvalid[] =
+    "InstallAttributesIsInvalid";
+const char kCryptohomeInstallAttributesIsFirstInstall[] =
+    "InstallAttributesIsFirstInstall";
+const char kCryptohomeStoreEnrollmentState[] =
+    "StoreEnrollmentState";
+const char kCryptohomeLoadEnrollmentState[] =
+    "LoadEnrollmentState";
+const char kCryptohomeTpmIsAttestationPrepared[] = "TpmIsAttestationPrepared";
+const char kCryptohomeTpmIsAttestationEnrolled[] = "TpmIsAttestationEnrolled";
+const char kCryptohomeAsyncTpmAttestationCreateEnrollRequest[] =
+    "AsyncTpmAttestationCreateEnrollRequest";
+const char kCryptohomeAsyncTpmAttestationCreateEnrollRequestNew[] =
+    "AsyncTpmAttestationCreateEnrollRequestNew";
+const char kCryptohomeAsyncTpmAttestationEnroll[] = "AsyncTpmAttestationEnroll";
+const char kCryptohomeAsyncTpmAttestationEnrollNew[] =
+    "AsyncTpmAttestationEnrollNew";
+const char kCryptohomeAsyncTpmAttestationCreateCertRequest[] =
+    "AsyncTpmAttestationCreateCertRequest";
+const char kCryptohomeAsyncTpmAttestationCreateCertRequestByProfile[] =
+    "AsyncTpmAttestationCreateCertRequestByProfile";
+const char kCryptohomeAsyncTpmAttestationFinishCertRequest[] =
+    "AsyncTpmAttestationFinishCertRequest";
+const char kCryptohomeTpmAttestationDoesKeyExist[] =
+    "TpmAttestationDoesKeyExist";
+const char kCryptohomeTpmAttestationGetCertificate[] =
+    "TpmAttestationGetCertificate";
+const char kCryptohomeTpmAttestationGetPublicKey[] =
+    "TpmAttestationGetPublicKey";
+const char kCryptohomeTpmAttestationRegisterKey[] = "TpmAttestationRegisterKey";
+const char kCryptohomeTpmAttestationSignEnterpriseChallenge[] =
+    "TpmAttestationSignEnterpriseChallenge";
+const char kCryptohomeTpmAttestationSignSimpleChallenge[] =
+    "TpmAttestationSignSimpleChallenge";
+const char kCryptohomeTpmAttestationGetKeyPayload[] =
+    "TpmAttestationGetKeyPayload";
+const char kCryptohomeTpmAttestationSetKeyPayload[] =
+    "TpmAttestationSetKeyPayload";
+const char kCryptohomeTpmAttestationDeleteKeys[] =
+    "TpmAttestationDeleteKeys";
+const char kCryptohomeGetKeyDataEx[] = "GetKeyDataEx";
+const char kCryptohomeCheckKeyEx[] = "CheckKeyEx";
+const char kCryptohomeMountEx[] = "MountEx";
+const char kCryptohomeAddKeyEx[] = "AddKeyEx";
+const char kCryptohomeUpdateKeyEx[] = "UpdateKeyEx";
+const char kCryptohomeRemoveKeyEx[] = "RemoveKeyEx";
+const char kCryptohomeSignBootLockbox[] = "SignBootLockbox";
+const char kCryptohomeVerifyBootLockbox[] = "VerifyBootLockbox";
+const char kCryptohomeFinalizeBootLockbox[] = "FinalizeBootLockbox";
+const char kCryptohomeGetBootAttribute[] = "GetBootAttribute";
+const char kCryptohomeSetBootAttribute[] = "SetBootAttribute";
+const char kCryptohomeFlushAndSignBootAttributes[] =
+    "FlushAndSignBootAttributes";
+const char kCryptohomeGetLoginStatus[] = "GetLoginStatus";
+const char kCryptohomeGetTpmStatus[] = "GetTpmStatus";
+const char kCryptohomeGetEndorsementInfo[] = "GetEndorsementInfo";
+
+// Signals
+const char kSignalAsyncCallStatus[] = "AsyncCallStatus";
+const char kSignalAsyncCallStatusWithData[] = "AsyncCallStatusWithData";
+const char kSignalTpmInitStatus[] = "TpmInitStatus";
+const char kSignalCleanupUsersRemoved[] = "CleanupUsersRemoved";
+// Error code
+enum MountError {
+  MOUNT_ERROR_NONE = 0,
+  MOUNT_ERROR_FATAL = 1 << 0,
+  MOUNT_ERROR_KEY_FAILURE = 1 << 1,
+  MOUNT_ERROR_MOUNT_POINT_BUSY = 1 << 2,
+  MOUNT_ERROR_TPM_COMM_ERROR = 1 << 3,
+  MOUNT_ERROR_TPM_DEFEND_LOCK = 1 << 4,
+  MOUNT_ERROR_USER_DOES_NOT_EXIST = 1 << 5,
+  MOUNT_ERROR_TPM_NEEDS_REBOOT = 1 << 6,
+  MOUNT_ERROR_RECREATED = 1 << 31,
+};
+}  // namespace cryptohome
+
+#endif  // SYSTEM_API_DBUS_CRYPTOHOME_DBUS_CONSTANTS_H_
diff --git a/dbus/debugd/dbus-constants.h b/dbus/debugd/dbus-constants.h
new file mode 100644
index 0000000..3427a99
--- /dev/null
+++ b/dbus/debugd/dbus-constants.h
@@ -0,0 +1,56 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_DEBUGD_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_DEBUGD_DBUS_CONSTANTS_H_
+
+namespace debugd {
+const char kDebugdInterface[] = "org.chromium.debugd";
+const char kDebugdServicePath[] = "/org/chromium/debugd";
+const char kDebugdServiceName[] = "org.chromium.debugd";
+
+// Methods.
+const char kDumpDebugLogs[] = "DumpDebugLogs";
+const char kGetDebugLogs[] = "GetDebugLogs";
+const char kGetInterfaces[] = "GetInterfaces";
+const char kGetModemStatus[] = "GetModemStatus";
+const char kGetNetworkStatus[] = "GetNetworkStatus";
+const char kGetPerfOutput[] = "GetPerfOutput";
+const char kGetRandomPerfOutput[] = "GetRandomPerfOutput";
+const char kGetRichPerfData[] = "GetRichPerfData";
+const char kGetRoutes[] = "GetRoutes";
+const char kGetWiMaxStatus[] = "GetWiMaxStatus";
+const char kSetDebugMode[] = "SetDebugMode";
+const char kSystraceStart[] = "SystraceStart";
+const char kSystraceStop[] = "SystraceStop";
+const char kSystraceStatus[] = "SystraceStatus";
+const char kGetLog[] = "GetLog";
+const char kGetAllLogs[] = "GetAllLogs";
+const char kGetUserLogFiles[] = "GetUserLogFiles";
+const char kGetFeedbackLogs[] = "GetFeedbackLogs";
+const char kTestICMP[] = "TestICMP";
+const char kTestICMPWithOptions[] = "TestICMPWithOptions";
+const char kLogKernelTaskStates[] = "LogKernelTaskStates";
+const char kUploadCrashes[] = "UploadCrashes";
+const char kRemoveRootfsVerification[] = "RemoveRootfsVerification";
+const char kEnableChromeRemoteDebugging[] = "EnableChromeRemoteDebugging";
+const char kEnableBootFromUsb[] = "EnableBootFromUsb";
+const char kConfigureSshServer[] = "ConfigureSshServer";
+const char kSetUserPassword[] = "SetUserPassword";
+const char kEnableChromeDevFeatures[] = "EnableChromeDevFeatures";
+const char kQueryDevFeatures[] = "QueryDevFeatures";
+
+// Values.
+enum DevFeatureFlag {
+  DEV_FEATURES_DISABLED = 1 << 0,
+  DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED = 1 << 1,
+  DEV_FEATURE_BOOT_FROM_USB_ENABLED = 1 << 2,
+  DEV_FEATURE_SSH_SERVER_CONFIGURED = 1 << 3,
+  DEV_FEATURE_DEV_MODE_ROOT_PASSWORD_SET = 1 << 4,
+  DEV_FEATURE_SYSTEM_ROOT_PASSWORD_SET = 1 << 5,
+  DEV_FEATURE_CHROME_REMOTE_DEBUGGING_ENABLED = 1 << 6,
+};
+}  // namespace debugd
+
+#endif  // SYSTEM_API_DBUS_DEBUGD_DBUS_CONSTANTS_H_
diff --git a/dbus/login_manager/dbus-constants.h b/dbus/login_manager/dbus-constants.h
new file mode 100644
index 0000000..1e33c02
--- /dev/null
+++ b/dbus/login_manager/dbus-constants.h
@@ -0,0 +1,62 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_LOGIN_MANAGER_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_LOGIN_MANAGER_DBUS_CONSTANTS_H_
+
+namespace login_manager {
+const char kSessionManagerInterface[] = "org.chromium.SessionManagerInterface";
+const char kSessionManagerServicePath[] = "/org/chromium/SessionManager";
+const char kSessionManagerServiceName[] = "org.chromium.SessionManager";
+// Methods
+const char kSessionManagerEmitLoginPromptReady[] = "EmitLoginPromptReady";
+const char kSessionManagerEmitLoginPromptVisible[] = "EmitLoginPromptVisible";
+const char kSessionManagerStartSession[] = "StartSession";
+const char kSessionManagerStopSession[] = "StopSession";
+const char kSessionManagerRestartJob[] = "RestartJob";
+const char kSessionManagerSetOwnerKey[] = "SetOwnerKey";
+const char kSessionManagerUnwhitelist[] = "Unwhitelist";
+const char kSessionManagerCheckWhitelist[] = "CheckWhitelist";
+const char kSessionManagerEnumerateWhitelisted[] = "EnumerateWhitelisted";
+const char kSessionManagerWhitelist[] = "Whitelist";
+const char kSessionManagerStoreProperty[] = "StoreProperty";
+const char kSessionManagerRetrieveProperty[] = "RetrieveProperty";
+const char kSessionManagerStorePolicy[] = "StorePolicy";
+const char kSessionManagerRetrievePolicy[] = "RetrievePolicy";
+const char kSessionManagerStorePolicyForUser[] = "StorePolicyForUser";
+const char kSessionManagerRetrievePolicyForUser[] = "RetrievePolicyForUser";
+const char kSessionManagerStoreDeviceLocalAccountPolicy[] =
+    "StoreDeviceLocalAccountPolicy";
+const char kSessionManagerRetrieveDeviceLocalAccountPolicy[] =
+    "RetrieveDeviceLocalAccountPolicy";
+const char kSessionManagerRetrieveSessionState[] = "RetrieveSessionState";
+const char kSessionManagerRetrieveActiveSessions[] = "RetrieveActiveSessions";
+const char kSessionManagerStartSessionService[] = "StartSessionService";
+const char kSessionManagerStopSessionService[] = "StopSessionService";
+const char kSessionManagerStartDeviceWipe[] = "StartDeviceWipe";
+const char kSessionManagerHandleSupervisedUserCreationStarting[] =
+    "HandleSupervisedUserCreationStarting";
+const char kSessionManagerHandleSupervisedUserCreationFinished[] =
+    "HandleSupervisedUserCreationFinished";
+const char kSessionManagerLockScreen[] = "LockScreen";
+const char kSessionManagerHandleLockScreenShown[] = "HandleLockScreenShown";
+const char kSessionManagerHandleLockScreenDismissed[] =
+    "HandleLockScreenDismissed";
+const char kSessionManagerHandleLivenessConfirmed[] = "HandleLivenessConfirmed";
+const char kSessionManagerSetFlagsForUser[] = "SetFlagsForUser";
+const char kSessionManagerGetServerBackedStateKeys[] =
+    "GetServerBackedStateKeys";
+const char kSessionManagerInitMachineInfo[] = "InitMachineInfo";
+// Signals
+const char kLoginPromptVisibleSignal[] = "LoginPromptVisible";
+const char kSessionStateChangedSignal[] = "SessionStateChanged";
+// ScreenLock signals.
+const char kScreenIsLockedSignal[] = "ScreenIsLocked";
+const char kScreenIsUnlockedSignal[] = "ScreenIsUnlocked";
+// Ownership API signals.
+const char kOwnerKeySetSignal[] = "SetOwnerKeyComplete";
+const char kPropertyChangeCompleteSignal[] = "PropertyChangeComplete";
+}  // namespace login_manager
+
+#endif  // SYSTEM_API_DBUS_LOGIN_MANAGER_DBUS_CONSTANTS_H_
diff --git a/dbus/lorgnette/dbus-constants.h b/dbus/lorgnette/dbus-constants.h
new file mode 100644
index 0000000..ac2e8ac
--- /dev/null
+++ b/dbus/lorgnette/dbus-constants.h
@@ -0,0 +1,31 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_LORGNETTE_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_LORGNETTE_DBUS_CONSTANTS_H_
+
+namespace lorgnette {
+const char kManagerServiceName[] = "org.chromium.lorgnette";
+const char kManagerServiceInterface[] = "org.chromium.lorgnette.Manager";
+const char kManagerServicePath[] = "/org/chromium/lorgnette/Manager";
+const char kManagerServiceError[] = "org.chromium.lorgnette.Error";
+
+// Methods.
+const char kListScannersMethod[] = "ListScanners";
+const char kScanImageMethod[] = "ScanImage";
+
+// Attributes of scanners returned from "ListScanners".
+const char kScannerPropertyManufacturer[] = "Manufacturer";
+const char kScannerPropertyModel[] = "Model";
+const char kScannerPropertyType[] = "Type";
+
+// Parameters supplied to a "ScanImage" request.
+const char kScanPropertyMode[] = "Mode";
+const char kScanPropertyModeColor[] = "Color";
+const char kScanPropertyModeGray[] = "Gray";
+const char kScanPropertyModeLineart[] = "Lineart";
+const char kScanPropertyResolution[] = "Resolution";
+}  // namespace lorgnette
+
+#endif  // SYSTEM_API_DBUS_LORGNETTE_DBUS_CONSTANTS_H_
diff --git a/dbus/permission_broker/dbus-constants.h b/dbus/permission_broker/dbus-constants.h
new file mode 100644
index 0000000..d3d37ef
--- /dev/null
+++ b/dbus/permission_broker/dbus-constants.h
@@ -0,0 +1,25 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_PERMISSION_BROKER_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_PERMISSION_BROKER_DBUS_CONSTANTS_H_
+
+namespace permission_broker {
+const char kPermissionBrokerInterface[] = "org.chromium.PermissionBroker";
+const char kPermissionBrokerServicePath[] = "/org/chromium/PermissionBroker";
+const char kPermissionBrokerServiceName[] = "org.chromium.PermissionBroker";
+
+// Methods
+const char kCheckPathAccess[] = "CheckPathAccess";
+const char kRequestPathAccess[] = "RequestPathAccess";
+const char kOpenPath[] = "OpenPath";
+const char kRequestTcpPortAccess[] = "RequestTcpPortAccess";
+const char kRequestUdpPortAccess[] = "RequestUdpPortAccess";
+const char kReleaseTcpPort[] = "ReleaseTcpPort";
+const char kReleaseUdpPort[] = "ReleaseUdpPort";
+const char kRequestVpnSetup[] = "RequestVpnSetup";
+const char kRemoveVpnSetup[] = "RemoveVpnSetup";
+}  // namespace permission_broker
+
+#endif  // SYSTEM_API_DBUS_PERMISSION_BROKER_DBUS_CONSTANTS_H_
diff --git a/dbus/power_manager/dbus-constants.h b/dbus/power_manager/dbus-constants.h
new file mode 100644
index 0000000..fa42cb1
--- /dev/null
+++ b/dbus/power_manager/dbus-constants.h
@@ -0,0 +1,66 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_POWER_MANAGER_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_POWER_MANAGER_DBUS_CONSTANTS_H_
+
+namespace power_manager {
+// powerd
+const char kPowerManagerInterface[] = "org.chromium.PowerManager";
+const char kPowerManagerServicePath[] = "/org/chromium/PowerManager";
+const char kPowerManagerServiceName[] = "org.chromium.PowerManager";
+// Methods exposed by powerd.
+const char kDecreaseScreenBrightnessMethod[] = "DecreaseScreenBrightness";
+const char kIncreaseScreenBrightnessMethod[] = "IncreaseScreenBrightness";
+const char kGetScreenBrightnessPercentMethod[] = "GetScreenBrightnessPercent";
+const char kSetScreenBrightnessPercentMethod[] = "SetScreenBrightnessPercent";
+const char kDecreaseKeyboardBrightnessMethod[] = "DecreaseKeyboardBrightness";
+const char kIncreaseKeyboardBrightnessMethod[] = "IncreaseKeyboardBrightness";
+const char kRequestRestartMethod[] = "RequestRestart";
+const char kRequestShutdownMethod[] = "RequestShutdown";
+const char kRequestSuspendMethod[] = "RequestSuspend";
+const char kGetPowerSupplyPropertiesMethod[] = "GetPowerSupplyProperties";
+const char kHandleUserActivityMethod[] = "HandleUserActivity";
+const char kHandleVideoActivityMethod[] = "HandleVideoActivity";
+const char kSetIsProjectingMethod[] = "SetIsProjecting";
+const char kSetPolicyMethod[] = "SetPolicy";
+const char kSetPowerSourceMethod[] = "SetPowerSource";
+const char kRegisterSuspendDelayMethod[] = "RegisterSuspendDelay";
+const char kUnregisterSuspendDelayMethod[] = "UnregisterSuspendDelay";
+const char kHandleSuspendReadinessMethod[] = "HandleSuspendReadiness";
+const char kRegisterDarkSuspendDelayMethod[] = "RegisterDarkSuspendDelay";
+const char kUnregisterDarkSuspendDelayMethod[] = "UnregisterDarkSuspendDelay";
+const char kHandleDarkSuspendReadinessMethod[] = "HandleDarkSuspendReadiness";
+const char kHandlePowerButtonAcknowledgmentMethod[] =
+    "HandlePowerButtonAcknowledgment";
+const char kRecordDarkResumeWakeReasonMethod[] = "RecordDarkResumeWakeReason";
+// Signals emitted by powerd.
+const char kBrightnessChangedSignal[] = "BrightnessChanged";
+const char kKeyboardBrightnessChangedSignal[] = "KeyboardBrightnessChanged";
+const char kPeripheralBatteryStatusSignal[] = "PeripheralBatteryStatus";
+const char kPowerSupplyPollSignal[] = "PowerSupplyPoll";
+const char kSuspendImminentSignal[] = "SuspendImminent";
+const char kDarkSuspendImminentSignal[] = "DarkSuspendImminent";
+const char kSuspendDoneSignal[] = "SuspendDone";
+const char kInputEventSignal[] = "InputEvent";
+const char kIdleActionImminentSignal[] = "IdleActionImminent";
+const char kIdleActionDeferredSignal[] = "IdleActionDeferred";
+// Values
+const int kBrightnessTransitionGradual = 1;
+const int kBrightnessTransitionInstant = 2;
+enum UserActivityType {
+  USER_ACTIVITY_OTHER = 0,
+  USER_ACTIVITY_BRIGHTNESS_UP_KEY_PRESS = 1,
+  USER_ACTIVITY_BRIGHTNESS_DOWN_KEY_PRESS = 2,
+  USER_ACTIVITY_VOLUME_UP_KEY_PRESS = 3,
+  USER_ACTIVITY_VOLUME_DOWN_KEY_PRESS = 4,
+  USER_ACTIVITY_VOLUME_MUTE_KEY_PRESS = 5,
+};
+enum RequestRestartReason {
+  REQUEST_RESTART_FOR_USER = 0,
+  REQUEST_RESTART_FOR_UPDATE = 1,
+};
+}  // namespace power_manager
+
+#endif  // SYSTEM_API_DBUS_POWER_MANAGER_DBUS_CONSTANTS_H_
diff --git a/dbus/service_constants.h b/dbus/service_constants.h
index 006e04f..7d965a8 100644
--- a/dbus/service_constants.h
+++ b/dbus/service_constants.h
@@ -2,11 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DBUS_SERVICE_CONSTANTS_H_
-#define DBUS_SERVICE_CONSTANTS_H_
+#ifndef SYSTEM_API_DBUS_SERVICE_CONSTANTS_H_
+#define SYSTEM_API_DBUS_SERVICE_CONSTANTS_H_
 
 #include <stdint.h>  // for uint32_t
 
+// We use relative includes here to make this compatible with both the
+// Chromium OS and Chromium environment.
+#include "apmanager/dbus-constants.h"
+#include "cros-disks/dbus-constants.h"
+#include "cryptohome/dbus-constants.h"
+#include "debugd/dbus-constants.h"
+#include "login_manager/dbus-constants.h"
+#include "lorgnette/dbus-constants.h"
+#include "permission_broker/dbus-constants.h"
+#include "power_manager/dbus-constants.h"
+#include "shill/dbus-constants.h"
+#include "update_engine/dbus-constants.h"
+
 namespace dbus {
 const char kDBusInterface[] = "org.freedesktop.DBus";
 const char kDBusServiceName[] = "org.freedesktop.DBus";
@@ -30,136 +43,6 @@ const char kDBusPropertiesGetAll[] = "GetAll";
 const char kDBusPropertiesChangedSignal[] = "PropertiesChanged";
 }  // namespace dbus
 
-
-namespace cryptohome {
-const char kCryptohomeInterface[] = "org.chromium.CryptohomeInterface";
-const char kCryptohomeServicePath[] = "/org/chromium/Cryptohome";
-const char kCryptohomeServiceName[] = "org.chromium.Cryptohome";
-// Methods
-const char kCryptohomeAsyncAddKey[] = "AsyncAddKey";
-const char kCryptohomeCheckKey[] = "CheckKey";
-const char kCryptohomeMigrateKey[] = "MigrateKey";
-const char kCryptohomeRemove[] = "Remove";
-const char kCryptohomeGetSystemSalt[] = "GetSystemSalt";
-const char kCryptohomeGetSanitizedUsername[] = "GetSanitizedUsername";
-const char kCryptohomeIsMounted[] = "IsMounted";
-const char kCryptohomeMount[] = "Mount";
-const char kCryptohomeMountGuest[] = "MountGuest";
-const char kCryptohomeMountPublic[] = "MountPublic";
-const char kCryptohomeUnmount[] = "Unmount";
-const char kCryptohomeTpmIsReady[] = "TpmIsReady";
-const char kCryptohomeTpmIsEnabled[] = "TpmIsEnabled";
-const char kCryptohomeTpmIsOwned[] = "TpmIsOwned";
-const char kCryptohomeTpmIsBeingOwned[] = "TpmIsBeingOwned";
-const char kCryptohomeTpmGetPassword[] = "TpmGetPassword";
-const char kCryptohomeTpmCanAttemptOwnership[] = "TpmCanAttemptOwnership";
-const char kCryptohomeTpmClearStoredPassword[] = "TpmClearStoredPassword";
-const char kCryptohomePkcs11GetTpmTokenInfo[] = "Pkcs11GetTpmTokenInfo";
-const char kCryptohomePkcs11GetTpmTokenInfoForUser[] =
-    "Pkcs11GetTpmTokenInfoForUser";
-const char kCryptohomePkcs11IsTpmTokenReady[] = "Pkcs11IsTpmTokenReady";
-const char kCryptohomePkcs11IsTpmTokenReadyForUser[] =
-    "Pkcs11IsTpmTokenReadyForUser";
-const char kCryptohomeAsyncCheckKey[] = "AsyncCheckKey";
-const char kCryptohomeAsyncMigrateKey[] = "AsyncMigrateKey";
-const char kCryptohomeAsyncMount[] = "AsyncMount";
-const char kCryptohomeAsyncMountGuest[] = "AsyncMountGuest";
-const char kCryptohomeAsyncMountPublic[] = "AsyncMountPublic";
-const char kCryptohomeAsyncRemove[] = "AsyncRemove";
-const char kCryptohomeGetStatusString[] = "GetStatusString";
-const char kCryptohomeRemoveTrackedSubdirectories[] =
-    "RemoveTrackedSubdirectories";
-const char kCryptohomeAsyncRemoveTrackedSubdirectories[] =
-    "AsyncRemoveTrackedSubdirectories";
-const char kCryptohomeDoAutomaticFreeDiskSpaceControl[] =
-    "DoAutomaticFreeDiskSpaceControl";
-const char kCryptohomeAsyncDoAutomaticFreeDiskSpaceControl[] =
-    "AsyncDoAutomaticFreeDiskSpaceControl";
-const char kCryptohomeAsyncDoesUsersExist[] = "AsyncDoesUsersExist";
-const char kCryptohomeInstallAttributesGet[] = "InstallAttributesGet";
-const char kCryptohomeInstallAttributesSet[] = "InstallAttributesSet";
-const char kCryptohomeInstallAttributesCount[] = "InstallAttributesCount";
-const char kCryptohomeInstallAttributesFinalize[] =
-    "InstallAttributesFinalize";
-const char kCryptohomeInstallAttributesIsReady[] = "InstallAttributesIsReady";
-const char kCryptohomeInstallAttributesIsSecure[] =
-    "InstallAttributesIsSecure";
-const char kCryptohomeInstallAttributesIsInvalid[] =
-    "InstallAttributesIsInvalid";
-const char kCryptohomeInstallAttributesIsFirstInstall[] =
-    "InstallAttributesIsFirstInstall";
-const char kCryptohomeStoreEnrollmentState[] =
-    "StoreEnrollmentState";
-const char kCryptohomeLoadEnrollmentState[] =
-    "LoadEnrollmentState";
-const char kCryptohomeTpmIsAttestationPrepared[] = "TpmIsAttestationPrepared";
-const char kCryptohomeTpmIsAttestationEnrolled[] = "TpmIsAttestationEnrolled";
-const char kCryptohomeAsyncTpmAttestationCreateEnrollRequest[] =
-    "AsyncTpmAttestationCreateEnrollRequest";
-const char kCryptohomeAsyncTpmAttestationCreateEnrollRequestNew[] =
-    "AsyncTpmAttestationCreateEnrollRequestNew";
-const char kCryptohomeAsyncTpmAttestationEnroll[] = "AsyncTpmAttestationEnroll";
-const char kCryptohomeAsyncTpmAttestationEnrollNew[] =
-    "AsyncTpmAttestationEnrollNew";
-const char kCryptohomeAsyncTpmAttestationCreateCertRequest[] =
-    "AsyncTpmAttestationCreateCertRequest";
-const char kCryptohomeAsyncTpmAttestationCreateCertRequestByProfile[] =
-    "AsyncTpmAttestationCreateCertRequestByProfile";
-const char kCryptohomeAsyncTpmAttestationFinishCertRequest[] =
-    "AsyncTpmAttestationFinishCertRequest";
-const char kCryptohomeTpmAttestationDoesKeyExist[] =
-    "TpmAttestationDoesKeyExist";
-const char kCryptohomeTpmAttestationGetCertificate[] =
-    "TpmAttestationGetCertificate";
-const char kCryptohomeTpmAttestationGetPublicKey[] =
-    "TpmAttestationGetPublicKey";
-const char kCryptohomeTpmAttestationRegisterKey[] = "TpmAttestationRegisterKey";
-const char kCryptohomeTpmAttestationSignEnterpriseChallenge[] =
-    "TpmAttestationSignEnterpriseChallenge";
-const char kCryptohomeTpmAttestationSignSimpleChallenge[] =
-    "TpmAttestationSignSimpleChallenge";
-const char kCryptohomeTpmAttestationGetKeyPayload[] =
-    "TpmAttestationGetKeyPayload";
-const char kCryptohomeTpmAttestationSetKeyPayload[] =
-    "TpmAttestationSetKeyPayload";
-const char kCryptohomeTpmAttestationDeleteKeys[] =
-    "TpmAttestationDeleteKeys";
-const char kCryptohomeGetKeyDataEx[] = "GetKeyDataEx";
-const char kCryptohomeCheckKeyEx[] = "CheckKeyEx";
-const char kCryptohomeMountEx[] = "MountEx";
-const char kCryptohomeAddKeyEx[] = "AddKeyEx";
-const char kCryptohomeUpdateKeyEx[] = "UpdateKeyEx";
-const char kCryptohomeRemoveKeyEx[] = "RemoveKeyEx";
-const char kCryptohomeSignBootLockbox[] = "SignBootLockbox";
-const char kCryptohomeVerifyBootLockbox[] = "VerifyBootLockbox";
-const char kCryptohomeFinalizeBootLockbox[] = "FinalizeBootLockbox";
-const char kCryptohomeGetBootAttribute[] = "GetBootAttribute";
-const char kCryptohomeSetBootAttribute[] = "SetBootAttribute";
-const char kCryptohomeFlushAndSignBootAttributes[] =
-    "FlushAndSignBootAttributes";
-const char kCryptohomeGetLoginStatus[] = "GetLoginStatus";
-const char kCryptohomeGetTpmStatus[] = "GetTpmStatus";
-const char kCryptohomeGetEndorsementInfo[] = "GetEndorsementInfo";
-
-// Signals
-const char kSignalAsyncCallStatus[] = "AsyncCallStatus";
-const char kSignalAsyncCallStatusWithData[] = "AsyncCallStatusWithData";
-const char kSignalTpmInitStatus[] = "TpmInitStatus";
-const char kSignalCleanupUsersRemoved[] = "CleanupUsersRemoved";
-// Error code
-enum MountError {
-  MOUNT_ERROR_NONE = 0,
-  MOUNT_ERROR_FATAL = 1 << 0,
-  MOUNT_ERROR_KEY_FAILURE = 1 << 1,
-  MOUNT_ERROR_MOUNT_POINT_BUSY = 1 << 2,
-  MOUNT_ERROR_TPM_COMM_ERROR = 1 << 3,
-  MOUNT_ERROR_TPM_DEFEND_LOCK = 1 << 4,
-  MOUNT_ERROR_USER_DOES_NOT_EXIST = 1 << 5,
-  MOUNT_ERROR_TPM_NEEDS_REBOOT = 1 << 6,
-  MOUNT_ERROR_RECREATED = 1 << 31,
-};
-}  // namespace cryptohome
-
 namespace imageburn {
 const char kImageBurnServiceName[] = "org.chromium.ImageBurner";
 const char kImageBurnServicePath[] = "/org/chromium/ImageBurner";
@@ -171,60 +54,6 @@ const char kSignalBurnFinishedName[] = "burn_finished";
 const char kSignalBurnUpdateName[] = "burn_progress_update";
 }  // namespace imageburn
 
-namespace login_manager {
-const char kSessionManagerInterface[] = "org.chromium.SessionManagerInterface";
-const char kSessionManagerServicePath[] = "/org/chromium/SessionManager";
-const char kSessionManagerServiceName[] = "org.chromium.SessionManager";
-// Methods
-const char kSessionManagerEmitLoginPromptReady[] = "EmitLoginPromptReady";
-const char kSessionManagerEmitLoginPromptVisible[] = "EmitLoginPromptVisible";
-const char kSessionManagerStartSession[] = "StartSession";
-const char kSessionManagerStopSession[] = "StopSession";
-const char kSessionManagerRestartJob[] = "RestartJob";
-const char kSessionManagerSetOwnerKey[] = "SetOwnerKey";
-const char kSessionManagerUnwhitelist[] = "Unwhitelist";
-const char kSessionManagerCheckWhitelist[] = "CheckWhitelist";
-const char kSessionManagerEnumerateWhitelisted[] = "EnumerateWhitelisted";
-const char kSessionManagerWhitelist[] = "Whitelist";
-const char kSessionManagerStoreProperty[] = "StoreProperty";
-const char kSessionManagerRetrieveProperty[] = "RetrieveProperty";
-const char kSessionManagerStorePolicy[] = "StorePolicy";
-const char kSessionManagerRetrievePolicy[] = "RetrievePolicy";
-const char kSessionManagerStorePolicyForUser[] = "StorePolicyForUser";
-const char kSessionManagerRetrievePolicyForUser[] = "RetrievePolicyForUser";
-const char kSessionManagerStoreDeviceLocalAccountPolicy[] =
-    "StoreDeviceLocalAccountPolicy";
-const char kSessionManagerRetrieveDeviceLocalAccountPolicy[] =
-    "RetrieveDeviceLocalAccountPolicy";
-const char kSessionManagerRetrieveSessionState[] = "RetrieveSessionState";
-const char kSessionManagerRetrieveActiveSessions[] = "RetrieveActiveSessions";
-const char kSessionManagerStartSessionService[] = "StartSessionService";
-const char kSessionManagerStopSessionService[] = "StopSessionService";
-const char kSessionManagerStartDeviceWipe[] = "StartDeviceWipe";
-const char kSessionManagerHandleSupervisedUserCreationStarting[] =
-    "HandleSupervisedUserCreationStarting";
-const char kSessionManagerHandleSupervisedUserCreationFinished[] =
-    "HandleSupervisedUserCreationFinished";
-const char kSessionManagerLockScreen[] = "LockScreen";
-const char kSessionManagerHandleLockScreenShown[] = "HandleLockScreenShown";
-const char kSessionManagerHandleLockScreenDismissed[] =
-    "HandleLockScreenDismissed";
-const char kSessionManagerHandleLivenessConfirmed[] = "HandleLivenessConfirmed";
-const char kSessionManagerSetFlagsForUser[] = "SetFlagsForUser";
-const char kSessionManagerGetServerBackedStateKeys[] =
-    "GetServerBackedStateKeys";
-const char kSessionManagerInitMachineInfo[] = "InitMachineInfo";
-// Signals
-const char kLoginPromptVisibleSignal[] = "LoginPromptVisible";
-const char kSessionStateChangedSignal[] = "SessionStateChanged";
-// ScreenLock signals.
-const char kScreenIsLockedSignal[] = "ScreenIsLocked";
-const char kScreenIsUnlockedSignal[] = "ScreenIsUnlocked";
-// Ownership API signals.
-const char kOwnerKeySetSignal[] = "SetOwnerKeyComplete";
-const char kPropertyChangeCompleteSignal[] = "PropertyChangeComplete";
-}  // namespace login_manager
-
 namespace speech_synthesis {
 const char kSpeechSynthesizerInterface[] =
     "org.chromium.SpeechSynthesizerInterface";
@@ -244,64 +73,6 @@ const char kTTSReadySignal[] = "TTSReady";
 const char kTTSFailedSignal[] = "TTSFailed";
 }  // namespace chromium
 
-namespace power_manager {
-// powerd
-const char kPowerManagerInterface[] = "org.chromium.PowerManager";
-const char kPowerManagerServicePath[] = "/org/chromium/PowerManager";
-const char kPowerManagerServiceName[] = "org.chromium.PowerManager";
-// Methods exposed by powerd.
-const char kDecreaseScreenBrightnessMethod[] = "DecreaseScreenBrightness";
-const char kIncreaseScreenBrightnessMethod[] = "IncreaseScreenBrightness";
-const char kGetScreenBrightnessPercentMethod[] = "GetScreenBrightnessPercent";
-const char kSetScreenBrightnessPercentMethod[] = "SetScreenBrightnessPercent";
-const char kDecreaseKeyboardBrightnessMethod[] = "DecreaseKeyboardBrightness";
-const char kIncreaseKeyboardBrightnessMethod[] = "IncreaseKeyboardBrightness";
-const char kRequestRestartMethod[] = "RequestRestart";
-const char kRequestShutdownMethod[] = "RequestShutdown";
-const char kRequestSuspendMethod[] = "RequestSuspend";
-const char kGetPowerSupplyPropertiesMethod[] = "GetPowerSupplyProperties";
-const char kHandleUserActivityMethod[] = "HandleUserActivity";
-const char kHandleVideoActivityMethod[] = "HandleVideoActivity";
-const char kSetIsProjectingMethod[] = "SetIsProjecting";
-const char kSetPolicyMethod[] = "SetPolicy";
-const char kSetPowerSourceMethod[] = "SetPowerSource";
-const char kRegisterSuspendDelayMethod[] = "RegisterSuspendDelay";
-const char kUnregisterSuspendDelayMethod[] = "UnregisterSuspendDelay";
-const char kHandleSuspendReadinessMethod[] = "HandleSuspendReadiness";
-const char kRegisterDarkSuspendDelayMethod[] = "RegisterDarkSuspendDelay";
-const char kUnregisterDarkSuspendDelayMethod[] = "UnregisterDarkSuspendDelay";
-const char kHandleDarkSuspendReadinessMethod[] = "HandleDarkSuspendReadiness";
-const char kHandlePowerButtonAcknowledgmentMethod[] =
-    "HandlePowerButtonAcknowledgment";
-const char kRecordDarkResumeWakeReasonMethod[] = "RecordDarkResumeWakeReason";
-// Signals emitted by powerd.
-const char kBrightnessChangedSignal[] = "BrightnessChanged";
-const char kKeyboardBrightnessChangedSignal[] = "KeyboardBrightnessChanged";
-const char kPeripheralBatteryStatusSignal[] = "PeripheralBatteryStatus";
-const char kPowerSupplyPollSignal[] = "PowerSupplyPoll";
-const char kSuspendImminentSignal[] = "SuspendImminent";
-const char kDarkSuspendImminentSignal[] = "DarkSuspendImminent";
-const char kSuspendDoneSignal[] = "SuspendDone";
-const char kInputEventSignal[] = "InputEvent";
-const char kIdleActionImminentSignal[] = "IdleActionImminent";
-const char kIdleActionDeferredSignal[] = "IdleActionDeferred";
-// Values
-const int kBrightnessTransitionGradual = 1;
-const int kBrightnessTransitionInstant = 2;
-enum UserActivityType {
-  USER_ACTIVITY_OTHER = 0,
-  USER_ACTIVITY_BRIGHTNESS_UP_KEY_PRESS = 1,
-  USER_ACTIVITY_BRIGHTNESS_DOWN_KEY_PRESS = 2,
-  USER_ACTIVITY_VOLUME_UP_KEY_PRESS = 3,
-  USER_ACTIVITY_VOLUME_DOWN_KEY_PRESS = 4,
-  USER_ACTIVITY_VOLUME_MUTE_KEY_PRESS = 5,
-};
-enum RequestRestartReason {
-  REQUEST_RESTART_FOR_USER = 0,
-  REQUEST_RESTART_FOR_UPDATE = 1,
-};
-}  // namespace power_manager
-
 namespace chromeos {
 const char kLibCrosServiceName[] = "org.chromium.LibCrosService";
 const char kLibCrosServicePath[] = "/org/chromium/LibCrosService";
@@ -323,708 +94,6 @@ enum DisplayPowerState {
 };
 }  // namespace chromeos
 
-// TODO(benchan): Reorganize shill constants and remove deprecated ones.
-namespace shill {
-// Flimflam D-Bus service identifiers.
-const char kFlimflamManagerInterface[] = "org.chromium.flimflam.Manager";
-const char kFlimflamServiceName[] = "org.chromium.flimflam";
-const char kFlimflamServicePath[] = "/";  // crosbug.com/20135
-const char kFlimflamServiceInterface[] = "org.chromium.flimflam.Service";
-const char kFlimflamIPConfigInterface[] = "org.chromium.flimflam.IPConfig";
-const char kFlimflamDeviceInterface[] = "org.chromium.flimflam.Device";
-const char kFlimflamProfileInterface[] = "org.chromium.flimflam.Profile";
-const char kFlimflamNetworkInterface[] = "org.chromium.flimflam.Network";
-const char kFlimflamThirdPartyVpnInterface[] =
-    "org.chromium.flimflam.ThirdPartyVpn";
-
-// Flimflam function names.
-const char kGetPropertiesFunction[] = "GetProperties";
-const char kSetPropertyFunction[] = "SetProperty";
-const char kClearPropertyFunction[] = "ClearProperty";
-const char kConnectFunction[] = "Connect";
-const char kDisconnectFunction[] = "Disconnect";
-const char kRequestScanFunction[] = "RequestScan";
-const char kGetServiceFunction[] = "GetService";
-const char kGetWifiServiceFunction[] = "GetWifiService";
-const char kGetVPNServiceFunction[] = "GetVPNService";
-const char kRemoveServiceFunction[] = "Remove";
-const char kEnableTechnologyFunction[] = "EnableTechnology";
-const char kDisableTechnologyFunction[] = "DisableTechnology";
-const char kAddIPConfigFunction[] = "AddIPConfig";
-const char kRemoveConfigFunction[] = "Remove";
-const char kGetEntryFunction[] = "GetEntry";
-const char kDeleteEntryFunction[] = "DeleteEntry";
-const char kActivateCellularModemFunction[] = "ActivateCellularModem";
-const char kRequirePinFunction[] = "RequirePin";
-const char kEnterPinFunction[] = "EnterPin";
-const char kUnblockPinFunction[] = "UnblockPin";
-const char kChangePinFunction[] = "ChangePin";
-const char kProposeScanFunction[] = "ProposeScan";
-const char kRegisterFunction[] = "Register";
-const char kConfigureServiceFunction[] = "ConfigureService";
-const char kConfigureWifiServiceFunction[] = "ConfigureWifiService";
-const char kFindMatchingServiceFunction[] = "FindMatchingService";
-
-// Flimflam Service property names.
-const char kSecurityProperty[] = "Security";
-const char kPriorityProperty[] = "Priority";
-const char kPriorityWithinTechnologyProperty[] = "PriorityWithinTechnology";
-const char kPassphraseProperty[] = "Passphrase";
-const char kIdentityProperty[] = "Identity";
-const char kAuthorityPathProperty[] = "AuthorityPath";
-const char kPassphraseRequiredProperty[] = "PassphraseRequired";
-const char kSaveCredentialsProperty[] = "SaveCredentials";
-const char kSignalStrengthProperty[] = "Strength";
-const char kNameProperty[] = "Name";
-const char kGuidProperty[] = "GUID";
-const char kStateProperty[] = "State";
-const char kTypeProperty[] = "Type";
-const char kDeviceProperty[] = "Device";
-const char kProfileProperty[] = "Profile";
-const char kConnectivityStateProperty[] = "ConnectivityState";
-const char kConnectableProperty[] = "Connectable";
-const char kAutoConnectProperty[] = "AutoConnect";
-const char kIsActiveProperty[] = "IsActive";
-const char kModeProperty[] = "Mode";
-const char kErrorProperty[] = "Error";
-const char kProviderProperty[] = "Provider";
-const char kHostProperty[] = "Host";
-const char kDomainProperty[] = "Domain";
-const char kProxyConfigProperty[] = "ProxyConfig";
-const char kCheckPortalProperty[] = "CheckPortal";
-const char kSSIDProperty[] = "SSID";
-const char kConnectedProperty[] = "Connected";
-const char kUIDataProperty[] = "UIData";
-const char kConnectionIdProperty[] = "ConnectionId";
-const char kVisibleProperty[] = "Visible";
-const char kDnsAutoFallbackProperty[] = "DNSAutoFallback";
-const char kPortalDetectionFailedPhaseProperty[] =
-    "PortalDetectionFailedPhase";
-const char kPortalDetectionFailedStatusProperty[] =
-    "PortalDetectionFailedStatus";
-const char kSavedIPConfigProperty[] = "SavedIPConfig";
-const char kStaticIPConfigProperty[] = "StaticIPConfig";
-const char kLinkMonitorDisableProperty[] = "LinkMonitorDisable";
-const char kSecurityClassProperty[] = "SecurityClass";
-
-// Flimflam provider property names.
-const char kProviderHostProperty[] = "Provider.Host";
-const char kProviderNameProperty[] = "Provider.Name";
-const char kProviderTypeProperty[] = "Provider.Type";
-
-// Flimflam Wifi Service property names.
-const char kWifiBSsid[] = "WiFi.BSSID";
-const char kWifiHexSsid[] = "WiFi.HexSSID";
-const char kWifiFrequency[] = "WiFi.Frequency";
-const char kWifiHiddenSsid[] = "WiFi.HiddenSSID";
-const char kWifiPhyMode[] = "WiFi.PhyMode";
-const char kWifiAuthMode[] = "WiFi.AuthMode";
-const char kWifiChannelProperty[] = "WiFi.Channel";
-const char kWifiPreferredDeviceProperty[] = "WiFi.PreferredDevice";
-const char kWifiRoamThresholdProperty[] = "WiFi.RoamThreshold";
-
-// Flimflam EAP property names.
-const char kEapIdentityProperty[] = "EAP.Identity";
-const char kEapMethodProperty[] = "EAP.EAP";
-const char kEapPhase2AuthProperty[] = "EAP.InnerEAP";
-const char kEapAnonymousIdentityProperty[] = "EAP.AnonymousIdentity";
-const char kEapClientCertProperty[] = "EAP.ClientCert";
-const char kEapCertIdProperty[] = "EAP.CertID";
-const char kEapClientCertNssProperty[] = "EAP.ClientCertNSS";
-const char kEapPrivateKeyProperty[] = "EAP.PrivateKey";
-const char kEapPrivateKeyPasswordProperty[] = "EAP.PrivateKeyPassword";
-const char kEapKeyIdProperty[] = "EAP.KeyID";
-const char kEapCaCertProperty[] = "EAP.CACert";
-const char kEapCaCertIdProperty[] = "EAP.CACertID";
-const char kEapCaCertNssProperty[] = "EAP.CACertNSS";
-const char kEapUseSystemCasProperty[] = "EAP.UseSystemCAs";
-const char kEapUseProactiveKeyCachingProperty[] = "EAP.UseProactiveKeyCaching";
-const char kEapPinProperty[] = "EAP.PIN";
-const char kEapPasswordProperty[] = "EAP.Password";
-const char kEapKeyMgmtProperty[] = "EAP.KeyMgmt";
-
-// Flimflam Cellular Service property names.
-const char kTechnologyFamilyProperty[] = "Cellular.Family";
-const char kActivationStateProperty[] = "Cellular.ActivationState";
-const char kNetworkTechnologyProperty[] = "Cellular.NetworkTechnology";
-const char kRoamingStateProperty[] = "Cellular.RoamingState";
-const char kOperatorNameProperty[] = "Cellular.OperatorName";
-const char kOperatorCodeProperty[] = "Cellular.OperatorCode";
-const char kServingOperatorProperty[] = "Cellular.ServingOperator";
-const char kPaymentPortalProperty[] = "Cellular.Olp";
-const char kUsageURLProperty[] = "Cellular.UsageUrl";
-const char kCellularApnProperty[] = "Cellular.APN";
-const char kCellularLastGoodApnProperty[] = "Cellular.LastGoodAPN";
-const char kCellularApnListProperty[] = "Cellular.APNList";
-
-// Flimflam Manager property names.
-const char kProfilesProperty[] = "Profiles";
-const char kServicesProperty[] = "Services";
-const char kServiceWatchListProperty[] = "ServiceWatchList";
-const char kAvailableTechnologiesProperty[] = "AvailableTechnologies";
-const char kEnabledTechnologiesProperty[] = "EnabledTechnologies";
-const char kConnectedTechnologiesProperty[] = "ConnectedTechnologies";
-const char kDefaultTechnologyProperty[] = "DefaultTechnology";
-const char kOfflineModeProperty[] = "OfflineMode";
-const char kActiveProfileProperty[] = "ActiveProfile";
-const char kDevicesProperty[] = "Devices";
-const char kCheckPortalListProperty[] = "CheckPortalList";
-const char kArpGatewayProperty[] = "ArpGateway";
-const char kCountryProperty[] = "Country";
-const char kPortalURLProperty[] = "PortalURL";
-const char kConnectionStateProperty[] = "ConnectionState";
-const char kClaimedDevicesProperty[] = "ClaimedDevices";
-
-// Flimflam Profile property names.
-const char kEntriesProperty[] = "Entries";
-
-// Flimflam Device property names.
-const char kScanningProperty[] = "Scanning";
-const char kPoweredProperty[] = "Powered";
-const char kNetworksProperty[] = "Networks";
-const char kScanIntervalProperty[] = "ScanInterval";
-const char kBgscanMethodProperty[] = "BgscanMethod";
-const char kBgscanShortIntervalProperty[] = "BgscanShortInterval";
-const char kRoamThresholdProperty[] = "RoamThreshold";
-const char kDBusObjectProperty[] = "DBus.Object";
-const char kDBusServiceProperty[] = "DBus.Service";
-const char kBgscanSignalThresholdProperty[] = "BgscanSignalThreshold";
-const char kWakeToScanPeriodSecondsProperty[] = "WakeToScanPeriodSeconds";
-const char kNetDetectScanPeriodSecondsProperty[] = "NetDetectScanPeriodSeconds";
-const char kForceWakeToScanTimerProperty[] = "ForceWakeToScanTimer";
-// The name of the network interface, ie. wlan0, eth0, etc.
-const char kInterfaceProperty[] = "Interface";
-const char kSelectedServiceProperty[] = "SelectedService";
-const char kIPConfigsProperty[] = "IPConfigs";
-
-// Flimflam Cellular Device property names.
-const char kCarrierProperty[] = "Cellular.Carrier";
-const char kCellularAllowRoamingProperty[] = "Cellular.AllowRoaming";
-const char kHomeProviderProperty[] = "Cellular.HomeProvider";
-const char kMeidProperty[] = "Cellular.MEID";
-const char kImeiProperty[] = "Cellular.IMEI";
-const char kIccidProperty[] = "Cellular.ICCID";
-const char kImsiProperty[] = "Cellular.IMSI";
-const char kEsnProperty[] = "Cellular.ESN";
-const char kMdnProperty[] = "Cellular.MDN";
-const char kMinProperty[] = "Cellular.MIN";
-const char kModelIDProperty[] = "Cellular.ModelID";
-const char kManufacturerProperty[] = "Cellular.Manufacturer";
-const char kFirmwareRevisionProperty[] = "Cellular.FirmwareRevision";
-const char kHardwareRevisionProperty[] = "Cellular.HardwareRevision";
-const char kPRLVersionProperty[] = "Cellular.PRLVersion";
-const char kSelectedNetworkProperty[] = "Cellular.SelectedNetwork";
-const char kSupportNetworkScanProperty[] = "Cellular.SupportNetworkScan";
-const char kFoundNetworksProperty[] = "Cellular.FoundNetworks";
-
-// Flimflam state options.
-const char kStateIdle[] = "idle";
-const char kStateCarrier[] = "carrier";
-const char kStateAssociation[] = "association";
-const char kStateConfiguration[] = "configuration";
-const char kStateReady[] = "ready";
-const char kStatePortal[] = "portal";
-const char kStateOffline[] = "offline";
-const char kStateOnline[] = "online";
-const char kStateDisconnect[] = "disconnect";
-const char kStateFailure[] = "failure";
-const char kStateActivationFailure[] = "activation-failure";
-
-// Flimflam portal phase and status.
-const char kPortalDetectionPhaseConnection[] = "Connection";
-const char kPortalDetectionPhaseDns[] = "DNS";
-const char kPortalDetectionPhaseHttp[] = "HTTP";
-const char kPortalDetectionPhaseContent[] = "Content";
-const char kPortalDetectionPhaseUnknown[] = "Unknown";
-const char kPortalDetectionStatusFailure[] = "Failure";
-const char kPortalDetectionStatusTimeout[] = "Timeout";
-const char kPortalDetectionStatusSuccess[] = "Success";
-
-// Flimflam property names for SIMLock status.
-const char kSIMLockStatusProperty[] = "Cellular.SIMLockStatus";
-const char kSIMLockTypeProperty[] = "LockType";
-const char kSIMLockRetriesLeftProperty[] = "RetriesLeft";
-const char kSIMLockEnabledProperty[] = "LockEnabled";
-
-// Flimflam property names for Cellular.FoundNetworks.
-const char kLongNameProperty[] = "long_name";
-const char kStatusProperty[] = "status";
-const char kShortNameProperty[] = "short_name";
-const char kTechnologyProperty[] = "technology";
-const char kNetworkIdProperty[] = "network_id";
-
-// Flimflam SIMLock status types.
-const char kSIMLockPin[] = "sim-pin";
-const char kSIMLockPuk[] = "sim-puk";
-
-// APN info property names.
-const char kApnProperty[] = "apn";
-const char kApnNetworkIdProperty[] = "network_id";
-const char kApnUsernameProperty[] = "username";
-const char kApnPasswordProperty[] = "password";
-const char kApnNameProperty[] = "name";
-const char kApnLocalizedNameProperty[] = "localized_name";
-const char kApnLanguageProperty[] = "language";
-
-// Payment Portal property names.
-const char kPaymentPortalURL[] = "url";
-const char kPaymentPortalMethod[] = "method";
-const char kPaymentPortalPostData[] = "postdata";
-
-// Operator info property names.
-const char kOperatorNameKey[] = "name";
-const char kOperatorCodeKey[] = "code";
-const char kOperatorCountryKey[] = "country";
-
-// Flimflam network technology options.
-const char kNetworkTechnology1Xrtt[] = "1xRTT";
-const char kNetworkTechnologyEvdo[] = "EVDO";
-const char kNetworkTechnologyGsm[] = "GSM";
-const char kNetworkTechnologyGprs[] = "GPRS";
-const char kNetworkTechnologyEdge[] = "EDGE";
-const char kNetworkTechnologyUmts[] = "UMTS";
-const char kNetworkTechnologyHspa[] = "HSPA";
-const char kNetworkTechnologyHspaPlus[] = "HSPA+";
-const char kNetworkTechnologyLte[] = "LTE";
-const char kNetworkTechnologyLteAdvanced[] = "LTE Advanced";
-
-// Flimflam roaming state options
-const char kRoamingStateHome[] = "home";
-const char kRoamingStateRoaming[] = "roaming";
-const char kRoamingStateUnknown[] = "unknown";
-
-// Flimflam activation state options
-const char kActivationStateActivated[] = "activated";
-const char kActivationStateActivating[] = "activating";
-const char kActivationStateNotActivated[] = "not-activated";
-const char kActivationStatePartiallyActivated[] = "partially-activated";
-const char kActivationStateUnknown[] = "unknown";
-
-// Flimflam EAP method options.
-const char kEapMethodPEAP[] = "PEAP";
-const char kEapMethodTLS[] = "TLS";
-const char kEapMethodTTLS[] = "TTLS";
-const char kEapMethodLEAP[] = "LEAP";
-
-// Flimflam EAP phase 2 auth options.
-const char kEapPhase2AuthPEAPMD5[] = "auth=MD5";
-const char kEapPhase2AuthPEAPMSCHAPV2[] = "auth=MSCHAPV2";
-const char kEapPhase2AuthPEAPGTC[] = "auth=GTC";
-const char kEapPhase2AuthTTLSMD5[] = "autheap=MD5";  // crosbug/26822
-const char kEapPhase2AuthTTLSEAPMD5[] = "autheap=MD5";
-const char kEapPhase2AuthTTLSEAPMSCHAPV2[] = "autheap=MSCHAPV2";
-const char kEapPhase2AuthTTLSMSCHAPV2[] = "auth=MSCHAPV2";
-const char kEapPhase2AuthTTLSMSCHAP[] = "auth=MSCHAP";
-const char kEapPhase2AuthTTLSPAP[] = "auth=PAP";
-const char kEapPhase2AuthTTLSCHAP[] = "auth=CHAP";
-const char kEapPhase2AuthTTLSGTC[] = "auth=GTC";
-const char kEapPhase2AuthTTLSEAPGTC[] = "autheap=GTC";
-
-// Flimflam VPN provider types.
-const char kProviderL2tpIpsec[] = "l2tpipsec";
-const char kProviderOpenVpn[] = "openvpn";
-const char kProviderThirdPartyVpn[] = "thirdpartyvpn";
-
-// Flimflam VPN service properties
-const char kVPNDomainProperty[] = "VPN.Domain";
-
-// Flimflam monitored properties
-const char kMonitorPropertyChanged[] = "PropertyChanged";
-
-// Flimflam type options.
-const char kTypeEthernet[] = "ethernet";
-const char kTypeWifi[] = "wifi";
-const char kTypeWimax[] = "wimax";
-const char kTypeBluetooth[] = "bluetooth";
-const char kTypeCellular[] = "cellular";
-const char kTypeVPN[] = "vpn";
-const char kTypePPPoE[] = "pppoe";
-
-// Flimflam mode options.
-const char kModeManaged[] = "managed";
-const char kModeAdhoc[] = "adhoc";
-
-// Flimflam security options.
-const char kSecurityWpa[] = "wpa";
-const char kSecurityWep[] = "wep";
-const char kSecurityRsn[] = "rsn";
-const char kSecurity8021x[] = "802_1x";
-const char kSecurityPsk[] = "psk";
-const char kSecurityNone[] = "none";
-
-// Flimflam L2TPIPsec property names.
-const char kL2tpIpsecAuthenticationType[] = "L2TPIPsec.AuthenticationType";
-const char kL2tpIpsecCaCertNssProperty[] = "L2TPIPsec.CACertNSS";
-const char kL2tpIpsecClientCertIdProperty[] = "L2TPIPsec.ClientCertID";
-const char kL2tpIpsecClientCertSlotProperty[] = "L2TPIPsec.ClientCertSlot";
-const char kL2tpIpsecIkeVersion[] = "L2TPIPsec.IKEVersion";
-const char kL2tpIpsecPinProperty[] = "L2TPIPsec.PIN";
-const char kL2tpIpsecPskProperty[] = "L2TPIPsec.PSK";
-const char kL2tpIpsecPskRequiredProperty[] = "L2TPIPsec.PSKRequired";
-const char kL2tpIpsecUserProperty[] = "L2TPIPsec.User";
-const char kL2tpIpsecPasswordProperty[] = "L2TPIPsec.Password";
-
-// Flimflam OpenVPN property names.
-const char kOpenVPNAuthNoCacheProperty[] = "OpenVPN.AuthNoCache";
-const char kOpenVPNAuthProperty[] = "OpenVPN.Auth";
-const char kOpenVPNAuthRetryProperty[] = "OpenVPN.AuthRetry";
-const char kOpenVPNAuthUserPassProperty[] = "OpenVPN.AuthUserPass";
-const char kOpenVPNCaCertProperty[] = "OpenVPN.CACert";
-const char kOpenVPNCaCertNSSProperty[] = "OpenVPN.CACertNSS";
-const char kOpenVPNClientCertIdProperty[] = "OpenVPN.Pkcs11.ID";
-const char kOpenVPNClientCertSlotProperty[] = "OpenVPN.Pkcs11.Slot";
-const char kOpenVPNCipherProperty[] = "OpenVPN.Cipher";
-const char kOpenVPNCompLZOProperty[] = "OpenVPN.CompLZO";
-const char kOpenVPNCompNoAdaptProperty[] = "OpenVPN.CompNoAdapt";
-const char kOpenVPNIgnoreDefaultRouteProperty[] = "OpenVPN.IgnoreDefaultRoute";
-const char kOpenVPNKeyDirectionProperty[] = "OpenVPN.KeyDirection";
-const char kOpenVPNMgmtEnableProperty[] = "OpenVPN.Mgmt.Enable";
-const char kOpenVPNNsCertTypeProperty[] = "OpenVPN.NsCertType";
-const char kOpenVPNOTPProperty[] = "OpenVPN.OTP";
-const char kOpenVPNPasswordProperty[] = "OpenVPN.Password";
-const char kOpenVPNPinProperty[] = "OpenVPN.Pkcs11.PIN";
-const char kOpenVPNPortProperty[] = "OpenVPN.Port";
-const char kOpenVPNProtoProperty[] = "OpenVPN.Proto";
-const char kOpenVPNProviderProperty[] = "OpenVPN.Pkcs11.Provider";
-const char kOpenVPNPushPeerInfoProperty[] = "OpenVPN.PushPeerInfo";
-const char kOpenVPNRemoteCertEKUProperty[] = "OpenVPN.RemoteCertEKU";
-const char kOpenVPNRemoteCertKUProperty[] = "OpenVPN.RemoteCertKU";
-const char kOpenVPNRemoteCertTLSProperty[] = "OpenVPN.RemoteCertTLS";
-const char kOpenVPNRenegSecProperty[] = "OpenVPN.RenegSec";
-const char kOpenVPNServerPollTimeoutProperty[] = "OpenVPN.ServerPollTimeout";
-const char kOpenVPNShaperProperty[] = "OpenVPN.Shaper";
-const char kOpenVPNStaticChallengeProperty[] = "OpenVPN.StaticChallenge";
-const char kOpenVPNTLSAuthContentsProperty[] = "OpenVPN.TLSAuthContents";
-const char kOpenVPNTLSRemoteProperty[] = "OpenVPN.TLSRemote";
-const char kOpenVPNUserProperty[] = "OpenVPN.User";
-
-// FlimFlam PPPoE property names.
-const char kPPPoEUsernameProperty[] = "PPPoE.Username";
-const char kPPPoEPasswordProperty[] = "PPPoE.Password";
-const char kPPPoELCPEchoIntervalProperty[] = "PPPoE.LCPEchoInterval";
-const char kPPPoELCPEchoFailureProperty[] = "PPPoE.LCPEchoFailure";
-const char kPPPoEMaxAuthFailureProperty[] = "PPPoE.MaxAuthFailure";
-
-// FlimFlam technology family options
-const char kTechnologyFamilyCdma[] = "CDMA";
-const char kTechnologyFamilyGsm[] = "GSM";
-
-// IPConfig property names.
-const char kMethodProperty[] = "Method";
-const char kAddressProperty[] = "Address";
-const char kMtuProperty[] = "Mtu";
-const char kPrefixlenProperty[] = "Prefixlen";
-const char kBroadcastProperty[] = "Broadcast";
-const char kPeerAddressProperty[] = "PeerAddress";
-const char kGatewayProperty[] = "Gateway";
-const char kDomainNameProperty[] = "DomainName";
-const char kAcceptedHostnameProperty[] = "AcceptedHostname";
-const char kNameServersProperty[] = "NameServers";
-const char kDelegatedPrefixProperty[] = "DelegatedPrefix";
-const char kDelegatedPrefixLengthProperty[] = "DelegatedPrefixLength";
-
-// IPConfig type options.
-const char kTypeIPv4[] = "ipv4";
-const char kTypeIPv6[] = "ipv6";
-const char kTypeDHCP[] = "dhcp";
-const char kTypeBOOTP[] = "bootp";
-const char kTypeZeroConf[] = "zeroconf";
-const char kTypeDHCP6[] = "dhcp6";
-const char kTypePPP[] = "ppp";
-
-// Flimflam error options.
-const char kErrorAaaFailed[] = "aaa-failed";
-const char kErrorActivationFailed[] = "activation-failed";
-const char kErrorBadPassphrase[] = "bad-passphrase";
-const char kErrorBadWEPKey[] = "bad-wepkey";
-const char kErrorConnectFailed[] = "connect-failed";
-const char kErrorDNSLookupFailed[] = "dns-lookup-failed";
-const char kErrorDhcpFailed[] = "dhcp-failed";
-const char kErrorHTTPGetFailed[] = "http-get-failed";
-const char kErrorInternal[] = "internal-error";
-const char kErrorIpsecCertAuthFailed[] = "ipsec-cert-auth-failed";
-const char kErrorIpsecPskAuthFailed[] = "ipsec-psk-auth-failed";
-const char kErrorNeedEvdo[] = "need-evdo";
-const char kErrorNeedHomeNetwork[] = "need-home-network";
-const char kErrorOtaspFailed[] = "otasp-failed";
-const char kErrorOutOfRange[] = "out-of-range";
-const char kErrorPinMissing[] = "pin-missing";
-const char kErrorPppAuthFailed[] = "ppp-auth-failed";
-
-// Flimflam error result codes.
-const char kErrorResultSuccess[] = "org.chromium.flimflam.Error.Success";
-const char kErrorResultFailure[] = "org.chromium.flimflam.Error.Failure";
-const char kErrorResultAlreadyConnected[] =
-    "org.chromium.flimflam.Error.AlreadyConnected";
-const char kErrorResultAlreadyExists[] =
-    "org.chromium.flimflam.Error.AlreadyExists";
-const char kErrorResultIncorrectPin[] =
-     "org.chromium.flimflam.Error.IncorrectPin";
-const char kErrorResultInProgress[] = "org.chromium.flimflam.Error.InProgress";
-const char kErrorResultInternalError[] =
-    "org.chromium.flimflam.Error.InternalError";
-const char kErrorResultInvalidApn[] = "org.chromium.flimflam.Error.InvalidApn";
-const char kErrorResultInvalidArguments[] =
-    "org.chromium.flimflam.Error.InvalidArguments";
-const char kErrorResultInvalidNetworkName[] =
-    "org.chromium.flimflam.Error.InvalidNetworkName";
-const char kErrorResultInvalidPassphrase[] =
-    "org.chromium.flimflam.Error.InvalidPassphrase";
-const char kErrorResultInvalidProperty[] =
-    "org.chromium.flimflam.Error.InvalidProperty";
-const char kErrorResultNoCarrier[] = "org.chromium.flimflam.Error.NoCarrier";
-const char kErrorResultNotConnected[] =
-     "org.chromium.flimflam.Error.NotConnected";
-const char kErrorResultNotFound[] = "org.chromium.flimflam.Error.NotFound";
-const char kErrorResultNotImplemented[] =
-    "org.chromium.flimflam.Error.NotImplemented";
-const char kErrorResultNotOnHomeNetwork[] =
-    "org.chromium.flimflam.Error.NotOnHomeNetwork";
-const char kErrorResultNotRegistered[] =
-    "org.chromium.flimflam.Error.NotRegistered";
-const char kErrorResultNotSupported[] =
-     "org.chromium.flimflam.Error.NotSupported";
-const char kErrorResultOperationAborted[] =
-    "org.chromium.flimflam.Error.OperationAborted";
-const char kErrorResultOperationInitiated[] =
-    "org.chromium.flimflam.Error.OperationInitiated";
-const char kErrorResultOperationTimeout[] =
-    "org.chromium.flimflam.Error.OperationTimeout";
-const char kErrorResultPassphraseRequired[] =
-    "org.chromium.flimflam.Error.PassphraseRequired";
-const char kErrorResultPermissionDenied[] =
-    "org.chromium.flimflam.Error.PermissionDenied";
-const char kErrorResultPinBlocked[] = "org.chromium.flimflam.Error.PinBlocked";
-const char kErrorResultPinRequired[] =
-     "org.chromium.flimflam.Error.PinRequired";
-const char kErrorResultWrongState[] = "org.chromium.flimflam.Error.WrongState";
-
-const char kUnknownString[] = "UNKNOWN";
-
-// Function names.
-const char kClearPropertiesFunction[] = "ClearProperties";
-const char kCompleteCellularActivationFunction[] = "CompleteCellularActivation";
-const char kConfigureServiceForProfileFunction[] = "ConfigureServiceForProfile";
-const char kConnectToBestServicesFunction[] = "ConnectToBestServices";
-const char kCreateConnectivityReportFunction[] = "CreateConnectivityReport";
-const char kAddWakeOnPacketConnectionFunction[] = "AddWakeOnPacketConnection";
-const char kRemoveWakeOnPacketConnectionFunction[] =
-    "RemoveWakeOnPacketConnection";
-const char kRemoveAllWakeOnPacketConnectionsFunction[] =
-    "RemoveAllWakeOnPacketConnections";
-const char kGetLoadableProfileEntriesFunction[] = "GetLoadableProfileEntries";
-const char kGetNetworksForGeolocation[] = "GetNetworksForGeolocation";
-const char kPerformTDLSOperationFunction[] = "PerformTDLSOperation";
-const char kRefreshFunction[] = "Refresh";
-const char kResetFunction[] = "Reset";
-const char kSetCarrierFunction[] = "SetCarrier";
-const char kSetPropertiesFunction[] = "SetProperties";
-const char kVerifyAndEncryptCredentialsFunction[] =
-    "VerifyAndEncryptCredentials";
-const char kVerifyAndEncryptDataFunction[] = "VerifyAndEncryptData";
-const char kVerifyDestinationFunction[] = "VerifyDestination";
-
-// ThirdPartyVpn functions.
-const char kSetParametersFunction[] = "SetParameters";
-const char kSendPacketFunction[] = "SendPacket";
-const char kUpdateConnectionStateFunction[] = "UpdateConnectionState";
-const char kOnPacketReceivedFunction[] = "OnPacketReceived";
-const char kOnPlatformMessageFunction[] = "OnPlatformMessage";
-
-// Device property names.
-const char kEapAuthenticationCompletedProperty[] = "EapAuthenticationCompleted";
-const char kEapAuthenticatorDetectedProperty[] = "EapAuthenticatorDetected";
-const char kLinkMonitorResponseTimeProperty[] = "LinkMonitorResponseTime";
-const char kLinkUpProperty[] = "Ethernet.LinkUp";
-const char kProviderRequiresRoamingProperty[] =
-    "Cellular.ProviderRequiresRoaming";
-const char kPPPoEProperty[] = "Ethernet.PPPoE";
-const char kReceiveByteCountProperty[] = "ReceiveByteCount";
-const char kSIMPresentProperty[] = "Cellular.SIMPresent";
-const char kSupportedCarriersProperty[] = "Cellular.SupportedCarriers";
-const char kTransmitByteCountProperty[] = "TransmitByteCount";
-
-// Technology types (augments "Flimflam type options" above).
-const char kTypeEthernetEap[] = "etherneteap";
-
-// Error strings.
-const char kErrorEapAuthenticationFailed[] = "eap-authentication-failed";
-const char kErrorEapLocalTlsFailed[] = "eap-local-tls-failed";
-const char kErrorEapRemoteTlsFailed[] = "eap-remote-tls-failed";
-
-// IPConfig property names.
-const char kSearchDomainsProperty[] = "SearchDomains";
-const char kVendorEncapsulatedOptionsProperty[] = "VendorEncapsulatedOptions";
-const char kWebProxyAutoDiscoveryUrlProperty[] = "WebProxyAutoDiscoveryUrl";
-
-// Manager property names.
-const char kDefaultServiceProperty[] = "DefaultService";
-const char kDisableWiFiVHTProperty[] = "DisableWiFiVHT";
-const char kHostNameProperty[] = "HostName";
-const char kIgnoredDNSSearchPathsProperty[] = "IgnoredDNSSearchPaths";
-const char kLinkMonitorTechnologiesProperty[] =
-    "LinkMonitorTechnologies";
-const char kNoAutoConnectTechnologiesProperty[] = "NoAutoConnectTechnologies";
-const char kPortalCheckIntervalProperty[] = "PortalCheckInterval";
-const char kProhibitedTechnologiesProperty[] = "ProhibitedTechnologies";
-const char kServiceCompleteListProperty[] = "ServiceCompleteList";
-const char kShortDNSTimeoutTechnologiesProperty[] =
-    "ShortDNSTimeoutTechnologies";
-const char kUninitializedTechnologiesProperty[] = "UninitializedTechnologies";
-const char kWakeOnLanEnabledProperty[] = "WakeOnLanEnabled";
-const char kWakeOnWiFiFeaturesEnabledProperty[] = "WakeOnWiFiFeaturesEnabled";
-
-// Service property names.
-const char kActivationTypeProperty[] = "Cellular.ActivationType";
-const char kDiagnosticsDisconnectsProperty[] = "Diagnostics.Disconnects";
-const char kDiagnosticsMisconnectsProperty[] = "Diagnostics.Misconnects";
-const char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
-const char kEapCaCertPemProperty[] = "EAP.CACertPEM";
-const char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
-const char kErrorDetailsProperty[] = "ErrorDetails";
-const char kHTTPProxyPortProperty[] = "HTTPProxyPort";
-const char kIPConfigProperty[] = "IPConfig";
-const char kL2tpIpsecCaCertPemProperty[] = "L2TPIPsec.CACertPEM";
-const char kL2tpIpsecTunnelGroupProperty[] = "L2TPIPsec.TunnelGroup";
-const char kL2tpIpsecXauthPasswordProperty[] = "L2TPIPsec.XauthPassword";
-const char kL2tpIpsecXauthUserProperty[] = "L2TPIPsec.XauthUser";
-const char kL2tpIpsecLcpEchoDisabledProperty[] = "L2TPIPsec.LCPEchoDisabled";
-const char kManagedCredentialsProperty[] = "ManagedCredentials";
-const char kOpenVPNCaCertPemProperty[] = "OpenVPN.CACertPEM";
-const char kOpenVPNCertProperty[] = "OpenVPN.Cert";
-const char kOpenVPNExtraCertPemProperty[] = "OpenVPN.ExtraCertPEM";
-const char kOpenVPNKeyProperty[] = "OpenVPN.Key";
-const char kOpenVPNPingProperty[] = "OpenVPN.Ping";
-const char kOpenVPNPingExitProperty[] = "OpenVPN.PingExit";
-const char kOpenVPNPingRestartProperty[] = "OpenVPN.PingRestart";
-const char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
-const char kOpenVPNTokenProperty[] = "OpenVPN.Token";
-const char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
-const char kOpenVPNVerifyHashProperty[] = "OpenVPN.VerifyHash";
-const char kOpenVPNVerifyX509NameProperty[] = "OpenVPN.VerifyX509Name";
-const char kOpenVPNVerifyX509TypeProperty[] = "OpenVPN.VerifyX509Type";
-const char kOutOfCreditsProperty[] = "Cellular.OutOfCredits";
-const char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
-const char kPreviousErrorProperty[] = "PreviousError";
-const char kPreviousErrorSerialNumberProperty[] = "PreviousErrorSerialNumber";
-const char kStaticIPAddressProperty[] = "StaticIP.Address";
-const char kStaticIPGatewayProperty[] = "StaticIP.Gateway";
-const char kStaticIPMtuProperty[] = "StaticIP.Mtu";
-const char kStaticIPNameServersProperty[] = "StaticIP.NameServers";
-const char kStaticIPPeerAddressProperty[] = "StaticIP.PeerAddress";
-const char kStaticIPPrefixlenProperty[] = "StaticIP.Prefixlen";
-const char kSavedIPAddressProperty[] = "SavedIP.Address";
-const char kSavedIPGatewayProperty[] = "SavedIP.Gateway";
-const char kSavedIPMtuProperty[] = "SavedIP.Mtu";
-const char kSavedIPNameServersProperty[] = "SavedIP.NameServers";
-const char kSavedIPPeerAddressProperty[] = "SavedIP.PeerAddress";
-const char kSavedIPPrefixlenProperty[] = "SavedIP.Prefixlen";
-const char kTetheringProperty[] = "Tethering";
-const char kVPNMTUProperty[] = "VPN.MTU";
-const char kWifiFrequencyListProperty[] = "WiFi.FrequencyList";
-const char kWifiVendorInformationProperty[] = "WiFi.VendorInformation";
-const char kWifiProtectedManagementFrameRequiredProperty[] =
-    "WiFi.ProtectedManagementFrameRequired";
-
-// Profile property names.
-const char kUserHashProperty[] = "UserHash";
-
-// Service Tethering property values.
-const char kTetheringNotDetectedState[] = "NotDetected";
-const char kTetheringSuspectedState[] = "Suspected";
-const char kTetheringConfirmedState[] = "Confirmed";
-
-// WiFi Service Vendor Information dictionary properties.
-const char kVendorWPSManufacturerProperty[] = "Manufacturer";
-const char kVendorWPSModelNameProperty[] = "ModelName";
-const char kVendorWPSModelNumberProperty[] = "ModelNumber";
-const char kVendorWPSDeviceNameProperty[] = "DeviceName";
-const char kVendorOUIListProperty[] = "OUIList";
-
-// WiFi Device link property names.
-const char kLinkStatisticsProperty[] = "LinkStatistics";
-const char kAverageReceiveSignalDbmProperty[] = "AverageReceiveSignalDbm";
-const char kInactiveTimeMillisecondsProperty[] =
-    "InactiveTimeMilliseconds";
-const char kLastReceiveSignalDbmProperty[] = "LastReceiveSignalDbm";
-const char kPacketReceiveSuccessesProperty[] = "PacketReceiveSuccesses";
-const char kPacketTransmitFailuresProperty[] = "PacketTransmitFailures";
-const char kPacketTransmitSuccessesProperty[] = "PacketTrasmitSuccesses";
-const char kTransmitBitrateProperty[] = "TransmitBitrate";
-const char kTransmitRetriesProperty[] = "TransmitRetries";
-
-// WiFi TDLS operations.
-const char kTDLSDiscoverOperation[] = "Discover";
-const char kTDLSSetupOperation[] = "Setup";
-const char kTDLSStatusOperation[] = "Status";
-const char kTDLSTeardownOperation[] = "Teardown";
-
-// WiFi TDLS states.
-const char kTDLSConnectedState[] = "Connected";
-const char kTDLSDisabledState[] = "Disabled";
-const char kTDLSDisconnectedState[] = "Disconnected";
-const char kTDLSNonexistentState[] = "Nonexistent";
-const char kTDLSUnknownState[] = "Unknown";
-
-// Wake on WiFi features.
-const char kWakeOnWiFiFeaturesEnabledPacket[] = "packet";
-const char kWakeOnWiFiFeaturesEnabledSSID[] = "ssid";
-const char kWakeOnWiFiFeaturesEnabledPacketSSID[] = "packet_and_ssid";
-const char kWakeOnWiFiFeaturesEnabledNone[] = "none";
-const char kWakeOnWiFiFeaturesEnabledNotSupported[] = "not_supported";
-
-// Cellular service carriers.
-const char kCarrierGenericUMTS[] = "Generic UMTS";
-const char kCarrierSprint[] = "Sprint";
-const char kCarrierVerizon[] = "Verizon Wireless";
-
-// Cellular activation types.
-const char kActivationTypeNonCellular[] = "NonCellular";  // For future use
-const char kActivationTypeOMADM[] = "OMADM";  // For future use
-const char kActivationTypeOTA[] = "OTA";
-const char kActivationTypeOTASP[] = "OTASP";
-
-// Geolocation property field names.
-// Reference:
-//    https://devsite.googleplex.com/maps/documentation/business/geolocation/
-// Top level properties for a Geolocation request.
-const char kGeoHomeMobileCountryCodeProperty[] = "homeMobileCountryCode";
-const char kGeoHomeMobileNetworkCodeProperty[] = "homeMobileNetworkCode";
-const char kGeoRadioTypePropertyProperty[] = "radioType";
-const char kGeoCellTowersProperty[] = "cellTowers";
-const char kGeoWifiAccessPointsProperty[] = "wifiAccessPoints";
-// Cell tower object property names.
-const char kGeoCellIdProperty[] = "cellId";
-const char kGeoLocationAreaCodeProperty[] = "locationAreaCode";
-const char kGeoMobileCountryCodeProperty[] = "mobileCountryCode";
-const char kGeoMobileNetworkCodeProperty[] = "mobileNetworkCode";
-const char kGeoTimingAdvanceProperty[] = "timingAdvance";
-// WiFi access point property names.
-const char kGeoMacAddressProperty[] = "macAddress";
-const char kGeoChannelProperty[] = "channel";
-const char kGeoSignalToNoiseRatioProperty[] = "signalToNoiseRatio";
-// Common property names for geolocation objects.
-const char kGeoAgeProperty[] = "age";
-const char kGeoSignalStrengthProperty[] = "signalStrength";
-// ThirdPartyVpn parameters, properties and constants.
-const char kAddressParameterThirdPartyVpn[] = "address";
-const char kBroadcastAddressParameterThirdPartyVpn[] = "broadcast_address";
-const char kGatewayParameterThirdPartyVpn[] = "gateway";
-const char kBypassTunnelForIpParameterThirdPartyVpn[] = "bypass_tunnel_for_ip";
-const char kSubnetPrefixParameterThirdPartyVpn[] = "subnet_prefix";
-const char kMtuParameterThirdPartyVpn[] = "mtu";
-const char kDomainSearchParameterThirdPartyVpn[] = "domain_search";
-const char kDnsServersParameterThirdPartyVpn[] = "dns_servers";
-const char kInclusionListParameterThirdPartyVpn[] = "inclusion_list";
-const char kExclusionListParameterThirdPartyVpn[] = "exclusion_list";
-const char kObjectPathSuffixProperty[] = "ObjectPathSuffix";
-const char kExtensionNameProperty[] = "ExtensionName";
-const char kConfigurationNameProperty[] = "ConfigurationName";
-const char kObjectPathBase[] = "/thirdpartyvpn/";
-const char kNonIPDelimiter = ':';
-const char kIPDelimiter = ' ';
-}  // namespace shill
-
 namespace cromo {
 // cromo D-Bus service identifiers
 const char kCromoServiceName[] = "org.chromium.ModemManager";
@@ -1712,117 +781,6 @@ const char kHandoverAgentInProgress[] =
     "org.neard.HandoverAgent.Error.InProgress";
 }  // namespace nfc_error
 
-namespace cros_disks {
-const char kCrosDisksInterface[] = "org.chromium.CrosDisks";
-const char kCrosDisksServicePath[] = "/org/chromium/CrosDisks";
-const char kCrosDisksServiceName[] = "org.chromium.CrosDisks";
-const char kCrosDisksServiceError[] = "org.chromium.CrosDisks.Error";
-
-// Methods.
-const char kEnumerateAutoMountableDevices[] = "EnumerateAutoMountableDevices";
-const char kEnumerateMountEntries[] = "EnumerateMountEntries";
-const char kFormat[] = "Format";
-const char kGetDeviceProperties[] = "GetDeviceProperties";
-const char kMount[] = "Mount";
-const char kUnmount[] = "Unmount";
-
-// Signals.
-const char kDeviceAdded[] = "DeviceAdded";
-const char kDeviceScanned[] = "DeviceScanned";
-const char kDeviceRemoved[] = "DeviceRemoved";
-const char kDiskAdded[] = "DiskAdded";
-const char kDiskChanged[] = "DiskChanged";
-const char kDiskRemoved[] = "DiskRemoved";
-const char kFormatCompleted[] = "FormatCompleted";
-const char kMountCompleted[] = "MountCompleted";
-
-// Properties.
-// TODO(benchan): Rename 'DeviceIs*' property to 'DiskIs*' as the latter is more
-// accurate.
-const char kDeviceFile[] = "DeviceFile";
-const char kDeviceIsDrive[] = "DeviceIsDrive";
-const char kDeviceIsMediaAvailable[] = "DeviceIsMediaAvailable";
-const char kDeviceIsMounted[] = "DeviceIsMounted";
-const char kDeviceIsOnBootDevice[] = "DeviceIsOnBootDevice";
-const char kDeviceIsOnRemovableDevice[] = "DeviceIsOnRemovableDevice";
-const char kDeviceIsReadOnly[] = "DeviceIsReadOnly";
-const char kDeviceIsVirtual[] = "DeviceIsVirtual";
-const char kDeviceMediaType[] = "DeviceMediaType";
-const char kDeviceMountPaths[] = "DeviceMountPaths";
-const char kDevicePresentationHide[] = "DevicePresentationHide";
-const char kDeviceSize[] = "DeviceSize";
-const char kDriveIsRotational[] = "DriveIsRotational";
-const char kDriveModel[] = "DriveModel";
-const char kExperimentalFeaturesEnabled[] = "ExperimentalFeaturesEnabled";
-const char kIdLabel[] = "IdLabel";
-const char kIdUuid[] = "IdUuid";
-const char kVendorId[] = "VendorId";
-const char kVendorName[] = "VendorName";
-const char kProductId[] = "ProductId";
-const char kProductName[] = "ProductName";
-const char kNativePath[] = "NativePath";
-
-// Enum values.
-// DeviceMediaType enum values are reported through UMA.
-// All values but DEVICE_MEDIA_NUM_VALUES should not be changed or removed.
-// Additional values can be added but DEVICE_MEDIA_NUM_VALUES should always
-// be the last value in the enum.
-enum DeviceMediaType {
-  DEVICE_MEDIA_UNKNOWN = 0,
-  DEVICE_MEDIA_USB = 1,
-  DEVICE_MEDIA_SD = 2,
-  DEVICE_MEDIA_OPTICAL_DISC = 3,
-  DEVICE_MEDIA_MOBILE = 4,
-  DEVICE_MEDIA_DVD = 5,
-  DEVICE_MEDIA_NUM_VALUES,
-};
-
-enum FormatErrorType {
-  FORMAT_ERROR_NONE = 0,
-  FORMAT_ERROR_UNKNOWN = 1,
-  FORMAT_ERROR_INTERNAL = 2,
-  FORMAT_ERROR_INVALID_DEVICE_PATH = 3,
-  FORMAT_ERROR_DEVICE_BEING_FORMATTED = 4,
-  FORMAT_ERROR_UNSUPPORTED_FILESYSTEM = 5,
-  FORMAT_ERROR_FORMAT_PROGRAM_NOT_FOUND = 6,
-  FORMAT_ERROR_FORMAT_PROGRAM_FAILED = 7,
-  FORMAT_ERROR_DEVICE_NOT_ALLOWED = 8,
-};
-
-// TODO(benchan): After both Chrome and cros-disks use these enum values,
-// make these error values contiguous so that they can be directly reported
-// via UMA.
-enum MountErrorType {
-  MOUNT_ERROR_NONE = 0,
-  MOUNT_ERROR_UNKNOWN = 1,
-  MOUNT_ERROR_INTERNAL = 2,
-  MOUNT_ERROR_INVALID_ARGUMENT = 3,
-  MOUNT_ERROR_INVALID_PATH = 4,
-  MOUNT_ERROR_PATH_ALREADY_MOUNTED = 5,
-  MOUNT_ERROR_PATH_NOT_MOUNTED = 6,
-  MOUNT_ERROR_DIRECTORY_CREATION_FAILED = 7,
-  MOUNT_ERROR_INVALID_MOUNT_OPTIONS = 8,
-  MOUNT_ERROR_INVALID_UNMOUNT_OPTIONS = 9,
-  MOUNT_ERROR_INSUFFICIENT_PERMISSIONS = 10,
-  MOUNT_ERROR_MOUNT_PROGRAM_NOT_FOUND = 11,
-  MOUNT_ERROR_MOUNT_PROGRAM_FAILED = 12,
-  MOUNT_ERROR_INVALID_DEVICE_PATH = 100,
-  MOUNT_ERROR_UNKNOWN_FILESYSTEM = 101,
-  MOUNT_ERROR_UNSUPPORTED_FILESYSTEM = 102,
-  MOUNT_ERROR_INVALID_ARCHIVE = 201,
-  MOUNT_ERROR_UNSUPPORTED_ARCHIVE = 202,
-};
-
-// MountSourceType enum values are solely used by Chrome/CrosDisks in
-// the MountCompleted signal, and currently not reported through UMA.
-enum MountSourceType {
-  MOUNT_SOURCE_INVALID = 0,
-  MOUNT_SOURCE_REMOVABLE_DEVICE = 1,
-  MOUNT_SOURCE_ARCHIVE = 2,
-  MOUNT_SOURCE_NETWORK_STORAGE = 3,
-};
-}  // namespace cros_disks
-
 namespace mtpd {
 const char kMtpdInterface[] = "org.chromium.Mtpd";
 const char kMtpdServicePath[] = "/org/chromium/Mtpd";
@@ -1860,105 +818,6 @@ const char kReadWriteMode[] = "rw";
 const uint32_t kRootFileId = 0;
 }  // namespace mtpd
 
-namespace update_engine {
-const char kUpdateEngineInterface[] = "org.chromium.UpdateEngineInterface";
-const char kUpdateEngineServicePath[] = "/org/chromium/UpdateEngine";
-const char kUpdateEngineServiceName[] = "org.chromium.UpdateEngine";
-
-// Methods.
-const char kAttemptUpdate[] = "AttemptUpdate";
-const char kGetStatus[] = "GetStatus";
-const char kRebootIfNeeded[] = "RebootIfNeeded";
-const char kSetChannel[] = "SetChannel";
-const char kGetChannel[] = "GetChannel";
-const char kAttemptRollback[] = "AttemptRollback";
-const char kCanRollback[] = "CanRollback";
-
-// Signals.
-const char kStatusUpdate[] = "StatusUpdate";
-
-// Operations contained in StatusUpdate signals.
-const char kUpdateStatusIdle[] = "UPDATE_STATUS_IDLE";
-const char kUpdateStatusCheckingForUpdate[] =
-    "UPDATE_STATUS_CHECKING_FOR_UPDATE";
-const char kUpdateStatusUpdateAvailable[] = "UPDATE_STATUS_UPDATE_AVAILABLE";
-const char kUpdateStatusDownloading[] = "UPDATE_STATUS_DOWNLOADING";
-const char kUpdateStatusVerifying[] = "UPDATE_STATUS_VERIFYING";
-const char kUpdateStatusFinalizing[] = "UPDATE_STATUS_FINALIZING";
-const char kUpdateStatusUpdatedNeedReboot[] =
-    "UPDATE_STATUS_UPDATED_NEED_REBOOT";
-const char kUpdateStatusReportingErrorEvent[] =
-    "UPDATE_STATUS_REPORTING_ERROR_EVENT";
-const char kUpdateStatusAttemptingRollback[] =
-    "UPDATE_STATUS_ATTEMPTING_ROLLBACK";
-const char kUpdateStatusDisabled[] = "UPDATE_STATUS_DISABLED";
-}  // namespace update_engine
-
-namespace debugd {
-const char kDebugdInterface[] = "org.chromium.debugd";
-const char kDebugdServicePath[] = "/org/chromium/debugd";
-const char kDebugdServiceName[] = "org.chromium.debugd";
-
-// Methods.
-const char kDumpDebugLogs[] = "DumpDebugLogs";
-const char kGetDebugLogs[] = "GetDebugLogs";
-const char kGetInterfaces[] = "GetInterfaces";
-const char kGetModemStatus[] = "GetModemStatus";
-const char kGetNetworkStatus[] = "GetNetworkStatus";
-const char kGetPerfOutput[] = "GetPerfOutput";
-const char kGetRandomPerfOutput[] = "GetRandomPerfOutput";
-const char kGetRichPerfData[] = "GetRichPerfData";
-const char kGetRoutes[] = "GetRoutes";
-const char kGetWiMaxStatus[] = "GetWiMaxStatus";
-const char kSetDebugMode[] = "SetDebugMode";
-const char kSystraceStart[] = "SystraceStart";
-const char kSystraceStop[] = "SystraceStop";
-const char kSystraceStatus[] = "SystraceStatus";
-const char kGetLog[] = "GetLog";
-const char kGetAllLogs[] = "GetAllLogs";
-const char kGetUserLogFiles[] = "GetUserLogFiles";
-const char kGetFeedbackLogs[] = "GetFeedbackLogs";
-const char kTestICMP[] = "TestICMP";
-const char kTestICMPWithOptions[] = "TestICMPWithOptions";
-const char kLogKernelTaskStates[] = "LogKernelTaskStates";
-const char kUploadCrashes[] = "UploadCrashes";
-const char kRemoveRootfsVerification[] = "RemoveRootfsVerification";
-const char kEnableChromeRemoteDebugging[] = "EnableChromeRemoteDebugging";
-const char kEnableBootFromUsb[] = "EnableBootFromUsb";
-const char kConfigureSshServer[] = "ConfigureSshServer";
-const char kSetUserPassword[] = "SetUserPassword";
-const char kEnableChromeDevFeatures[] = "EnableChromeDevFeatures";
-const char kQueryDevFeatures[] = "QueryDevFeatures";
-
-// Values.
-enum DevFeatureFlag {
-  DEV_FEATURES_DISABLED = 1 << 0,
-  DEV_FEATURE_ROOTFS_VERIFICATION_REMOVED = 1 << 1,
-  DEV_FEATURE_BOOT_FROM_USB_ENABLED = 1 << 2,
-  DEV_FEATURE_SSH_SERVER_CONFIGURED = 1 << 3,
-  DEV_FEATURE_DEV_MODE_ROOT_PASSWORD_SET = 1 << 4,
-  DEV_FEATURE_SYSTEM_ROOT_PASSWORD_SET = 1 << 5,
-  DEV_FEATURE_CHROME_REMOTE_DEBUGGING_ENABLED = 1 << 6,
-};
-}  // namespace debugd
-
-namespace permission_broker {
-const char kPermissionBrokerInterface[] = "org.chromium.PermissionBroker";
-const char kPermissionBrokerServicePath[] = "/org/chromium/PermissionBroker";
-const char kPermissionBrokerServiceName[] = "org.chromium.PermissionBroker";
-
-// Methods
-const char kCheckPathAccess[] = "CheckPathAccess";
-const char kRequestPathAccess[] = "RequestPathAccess";
-const char kOpenPath[] = "OpenPath";
-const char kRequestTcpPortAccess[] = "RequestTcpPortAccess";
-const char kRequestUdpPortAccess[] = "RequestUdpPortAccess";
-const char kReleaseTcpPort[] = "ReleaseTcpPort";
-const char kReleaseUdpPort[] = "ReleaseUdpPort";
-const char kRequestVpnSetup[] = "RequestVpnSetup";
-const char kRemoveVpnSetup[] = "RemoveVpnSetup";
-}  // namespace permission_broker
-
 namespace system_clock {
 const char kSystemClockInterface[] = "org.torproject.tlsdate";
 const char kSystemClockServicePath[] = "/org/torproject/tlsdate";
@@ -2020,29 +879,6 @@ const char kActiveInputNodeChanged[] = "ActiveInputNodeChanged";
 const char kNumberOfActiveStreamsChanged[] = "NumberOfActiveStreamsChanged";
 }  // namespace cras
 
-namespace lorgnette {
-const char kManagerServiceName[] = "org.chromium.lorgnette";
-const char kManagerServiceInterface[] = "org.chromium.lorgnette.Manager";
-const char kManagerServicePath[] = "/org/chromium/lorgnette/Manager";
-const char kManagerServiceError[] = "org.chromium.lorgnette.Error";
-
-// Methods.
-const char kListScannersMethod[] = "ListScanners";
-const char kScanImageMethod[] = "ScanImage";
-
-// Attributes of scanners returned from "ListScanners".
-const char kScannerPropertyManufacturer[] = "Manufacturer";
-const char kScannerPropertyModel[] = "Model";
-const char kScannerPropertyType[] = "Type";
-
-// Parameters supplied to a "ScanImage" request.
-const char kScanPropertyMode[] = "Mode";
-const char kScanPropertyModeColor[] = "Color";
-const char kScanPropertyModeGray[] = "Gray";
-const char kScanPropertyModeLineart[] = "Lineart";
-const char kScanPropertyResolution[] = "Resolution";
-}  // namespace lorgnette
-
 namespace feedback {
 const char kFeedbackServicePath[] = "/org/chromium/feedback";
 const char kFeedbackServiceName[] = "org.chromium.feedback";
@@ -2078,50 +914,4 @@ const char kCreateSecureMessageMethod[] = "CreateSecureMessage";
 const char kUnwrapSecureMessageMethod[] = "UnwrapSecureMessage";
 }  // namespace easy_unlock
 
-
-namespace apmanager {
-const char kServiceName[] = "org.chromium.apmanager";
-const char kManagerInterface[] = "org.chromium.apmanager.Manager";
-const char kManagerPath[] = "/manager";
-const char kManagerError[] = "org.chromium.apmanager.Manager.Error";
-const char kServiceInterface[] = "org.chromium.apmanager.Service";
-const char kServiceError[] = "org.chromium.apmanager.Service.Error";
-const char kConfigInterface[] = "org.chromium.apmanager.Config";
-const char kConfigError[] = "org.chromium.apmanager.Config.Error";
-const char kClientInterface[] = "org.chromium.apmanager.Client";
-const char kDeviceInterface[] = "org.chromium.apmanager.Device";
-
-// Manager Methods.
-const char kCreateServiceMethod[] = "CreateService";
-const char kRemoveServiceMethod[] = "RemoveService";
-
-// Config Properties.
-const char kConfigSSIDProperty[] = "Ssid";
-const char kConfigInterfaceNameProperty[] = "InterfaceName";
-const char kConfigSecurityModeProperty[] = "SecurityMode";
-const char kConfigPassphraseProperty[] = "Passphrase";
-const char kConfigHwModeProperty[] = "HwMode";
-const char kConfigOperationModeProperty[] = "OperationMode";
-const char kConfigChannelProperty[] = "Channel";
-const char kConfigHiddenNetworkProperty[] = "HiddenNetwork";
-const char kConfigBridgeInterfaceProperty[] = "BridgeInterface";
-const char kConfigServerAddressIndexProperty[] = "ServerAddressIndex";
-
-// Security modes.
-const char kSecurityModeNone[] = "none";
-const char kSecurityModeRSN[] = "rsn";
-
-// Hardware modes.
-const char kHwMode80211a[] = "802.11a";
-const char kHwMode80211b[] = "802.11b";
-const char kHwMode80211g[] = "802.11g";
-const char kHwMode80211n[] = "802.11n";
-const char kHwMode80211ac[] = "802.11ac";
-
-// Operation modes.
-const char kOperationModeServer[] = "server";
-const char kOperationModeBridge[] = "bridge";
-
-}  // namespace apmanager
-
-#endif  // DBUS_SERVICE_CONSTANTS_H_
+#endif  // SYSTEM_API_DBUS_SERVICE_CONSTANTS_H_
diff --git a/dbus/shill/dbus-constants.h b/dbus/shill/dbus-constants.h
new file mode 100644
index 0000000..b3ad4bc
--- /dev/null
+++ b/dbus/shill/dbus-constants.h
@@ -0,0 +1,710 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_SHILL_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_SHILL_DBUS_CONSTANTS_H_
+
+// TODO(benchan): Reorganize shill constants and remove deprecated ones.
+namespace shill {
+// Flimflam D-Bus service identifiers.
+const char kFlimflamManagerInterface[] = "org.chromium.flimflam.Manager";
+const char kFlimflamServiceName[] = "org.chromium.flimflam";
+const char kFlimflamServicePath[] = "/";  // crosbug.com/20135
+const char kFlimflamServiceInterface[] = "org.chromium.flimflam.Service";
+const char kFlimflamIPConfigInterface[] = "org.chromium.flimflam.IPConfig";
+const char kFlimflamDeviceInterface[] = "org.chromium.flimflam.Device";
+const char kFlimflamProfileInterface[] = "org.chromium.flimflam.Profile";
+const char kFlimflamNetworkInterface[] = "org.chromium.flimflam.Network";
+const char kFlimflamThirdPartyVpnInterface[] =
+    "org.chromium.flimflam.ThirdPartyVpn";
+
+// Flimflam function names.
+const char kGetPropertiesFunction[] = "GetProperties";
+const char kSetPropertyFunction[] = "SetProperty";
+const char kClearPropertyFunction[] = "ClearProperty";
+const char kConnectFunction[] = "Connect";
+const char kDisconnectFunction[] = "Disconnect";
+const char kRequestScanFunction[] = "RequestScan";
+const char kGetServiceFunction[] = "GetService";
+const char kGetWifiServiceFunction[] = "GetWifiService";
+const char kGetVPNServiceFunction[] = "GetVPNService";
+const char kRemoveServiceFunction[] = "Remove";
+const char kEnableTechnologyFunction[] = "EnableTechnology";
+const char kDisableTechnologyFunction[] = "DisableTechnology";
+const char kAddIPConfigFunction[] = "AddIPConfig";
+const char kRemoveConfigFunction[] = "Remove";
+const char kGetEntryFunction[] = "GetEntry";
+const char kDeleteEntryFunction[] = "DeleteEntry";
+const char kActivateCellularModemFunction[] = "ActivateCellularModem";
+const char kRequirePinFunction[] = "RequirePin";
+const char kEnterPinFunction[] = "EnterPin";
+const char kUnblockPinFunction[] = "UnblockPin";
+const char kChangePinFunction[] = "ChangePin";
+const char kProposeScanFunction[] = "ProposeScan";
+const char kRegisterFunction[] = "Register";
+const char kConfigureServiceFunction[] = "ConfigureService";
+const char kConfigureWifiServiceFunction[] = "ConfigureWifiService";
+const char kFindMatchingServiceFunction[] = "FindMatchingService";
+
+// Flimflam Service property names.
+const char kSecurityProperty[] = "Security";
+const char kPriorityProperty[] = "Priority";
+const char kPriorityWithinTechnologyProperty[] = "PriorityWithinTechnology";
+const char kPassphraseProperty[] = "Passphrase";
+const char kIdentityProperty[] = "Identity";
+const char kAuthorityPathProperty[] = "AuthorityPath";
+const char kPassphraseRequiredProperty[] = "PassphraseRequired";
+const char kSaveCredentialsProperty[] = "SaveCredentials";
+const char kSignalStrengthProperty[] = "Strength";
+const char kNameProperty[] = "Name";
+const char kGuidProperty[] = "GUID";
+const char kStateProperty[] = "State";
+const char kTypeProperty[] = "Type";
+const char kDeviceProperty[] = "Device";
+const char kProfileProperty[] = "Profile";
+const char kConnectivityStateProperty[] = "ConnectivityState";
+const char kConnectableProperty[] = "Connectable";
+const char kAutoConnectProperty[] = "AutoConnect";
+const char kIsActiveProperty[] = "IsActive";
+const char kModeProperty[] = "Mode";
+const char kErrorProperty[] = "Error";
+const char kProviderProperty[] = "Provider";
+const char kHostProperty[] = "Host";
+const char kDomainProperty[] = "Domain";
+const char kProxyConfigProperty[] = "ProxyConfig";
+const char kCheckPortalProperty[] = "CheckPortal";
+const char kSSIDProperty[] = "SSID";
+const char kConnectedProperty[] = "Connected";
+const char kUIDataProperty[] = "UIData";
+const char kConnectionIdProperty[] = "ConnectionId";
+const char kVisibleProperty[] = "Visible";
+const char kDnsAutoFallbackProperty[] = "DNSAutoFallback";
+const char kPortalDetectionFailedPhaseProperty[] =
+    "PortalDetectionFailedPhase";
+const char kPortalDetectionFailedStatusProperty[] =
+    "PortalDetectionFailedStatus";
+const char kSavedIPConfigProperty[] = "SavedIPConfig";
+const char kStaticIPConfigProperty[] = "StaticIPConfig";
+const char kLinkMonitorDisableProperty[] = "LinkMonitorDisable";
+const char kSecurityClassProperty[] = "SecurityClass";
+
+// Flimflam provider property names.
+const char kProviderHostProperty[] = "Provider.Host";
+const char kProviderNameProperty[] = "Provider.Name";
+const char kProviderTypeProperty[] = "Provider.Type";
+
+// Flimflam Wifi Service property names.
+const char kWifiBSsid[] = "WiFi.BSSID";
+const char kWifiHexSsid[] = "WiFi.HexSSID";
+const char kWifiFrequency[] = "WiFi.Frequency";
+const char kWifiHiddenSsid[] = "WiFi.HiddenSSID";
+const char kWifiPhyMode[] = "WiFi.PhyMode";
+const char kWifiAuthMode[] = "WiFi.AuthMode";
+const char kWifiChannelProperty[] = "WiFi.Channel";
+const char kWifiPreferredDeviceProperty[] = "WiFi.PreferredDevice";
+const char kWifiRoamThresholdProperty[] = "WiFi.RoamThreshold";
+
+// Flimflam EAP property names.
+const char kEapIdentityProperty[] = "EAP.Identity";
+const char kEapMethodProperty[] = "EAP.EAP";
+const char kEapPhase2AuthProperty[] = "EAP.InnerEAP";
+const char kEapAnonymousIdentityProperty[] = "EAP.AnonymousIdentity";
+const char kEapClientCertProperty[] = "EAP.ClientCert";
+const char kEapCertIdProperty[] = "EAP.CertID";
+const char kEapClientCertNssProperty[] = "EAP.ClientCertNSS";
+const char kEapPrivateKeyProperty[] = "EAP.PrivateKey";
+const char kEapPrivateKeyPasswordProperty[] = "EAP.PrivateKeyPassword";
+const char kEapKeyIdProperty[] = "EAP.KeyID";
+const char kEapCaCertProperty[] = "EAP.CACert";
+const char kEapCaCertIdProperty[] = "EAP.CACertID";
+const char kEapCaCertNssProperty[] = "EAP.CACertNSS";
+const char kEapUseSystemCasProperty[] = "EAP.UseSystemCAs";
+const char kEapUseProactiveKeyCachingProperty[] = "EAP.UseProactiveKeyCaching";
+const char kEapPinProperty[] = "EAP.PIN";
+const char kEapPasswordProperty[] = "EAP.Password";
+const char kEapKeyMgmtProperty[] = "EAP.KeyMgmt";
+
+// Flimflam Cellular Service property names.
+const char kTechnologyFamilyProperty[] = "Cellular.Family";
+const char kActivationStateProperty[] = "Cellular.ActivationState";
+const char kNetworkTechnologyProperty[] = "Cellular.NetworkTechnology";
+const char kRoamingStateProperty[] = "Cellular.RoamingState";
+const char kOperatorNameProperty[] = "Cellular.OperatorName";
+const char kOperatorCodeProperty[] = "Cellular.OperatorCode";
+const char kServingOperatorProperty[] = "Cellular.ServingOperator";
+const char kPaymentPortalProperty[] = "Cellular.Olp";
+const char kUsageURLProperty[] = "Cellular.UsageUrl";
+const char kCellularApnProperty[] = "Cellular.APN";
+const char kCellularLastGoodApnProperty[] = "Cellular.LastGoodAPN";
+const char kCellularApnListProperty[] = "Cellular.APNList";
+
+// Flimflam Manager property names.
+const char kProfilesProperty[] = "Profiles";
+const char kServicesProperty[] = "Services";
+const char kServiceWatchListProperty[] = "ServiceWatchList";
+const char kAvailableTechnologiesProperty[] = "AvailableTechnologies";
+const char kEnabledTechnologiesProperty[] = "EnabledTechnologies";
+const char kConnectedTechnologiesProperty[] = "ConnectedTechnologies";
+const char kDefaultTechnologyProperty[] = "DefaultTechnology";
+const char kOfflineModeProperty[] = "OfflineMode";
+const char kActiveProfileProperty[] = "ActiveProfile";
+const char kDevicesProperty[] = "Devices";
+const char kCheckPortalListProperty[] = "CheckPortalList";
+const char kArpGatewayProperty[] = "ArpGateway";
+const char kCountryProperty[] = "Country";
+const char kPortalURLProperty[] = "PortalURL";
+const char kConnectionStateProperty[] = "ConnectionState";
+const char kClaimedDevicesProperty[] = "ClaimedDevices";
+
+// Flimflam Profile property names.
+const char kEntriesProperty[] = "Entries";
+
+// Flimflam Device property names.
+const char kScanningProperty[] = "Scanning";
+const char kPoweredProperty[] = "Powered";
+const char kNetworksProperty[] = "Networks";
+const char kScanIntervalProperty[] = "ScanInterval";
+const char kBgscanMethodProperty[] = "BgscanMethod";
+const char kBgscanShortIntervalProperty[] = "BgscanShortInterval";
+const char kRoamThresholdProperty[] = "RoamThreshold";
+const char kDBusObjectProperty[] = "DBus.Object";
+const char kDBusServiceProperty[] = "DBus.Service";
+const char kBgscanSignalThresholdProperty[] = "BgscanSignalThreshold";
+const char kWakeToScanPeriodSecondsProperty[] = "WakeToScanPeriodSeconds";
+const char kNetDetectScanPeriodSecondsProperty[] = "NetDetectScanPeriodSeconds";
+const char kForceWakeToScanTimerProperty[] = "ForceWakeToScanTimer";
+// The name of the network interface, ie. wlan0, eth0, etc.
+const char kInterfaceProperty[] = "Interface";
+const char kSelectedServiceProperty[] = "SelectedService";
+const char kIPConfigsProperty[] = "IPConfigs";
+
+// Flimflam Cellular Device property names.
+const char kCarrierProperty[] = "Cellular.Carrier";
+const char kCellularAllowRoamingProperty[] = "Cellular.AllowRoaming";
+const char kHomeProviderProperty[] = "Cellular.HomeProvider";
+const char kMeidProperty[] = "Cellular.MEID";
+const char kImeiProperty[] = "Cellular.IMEI";
+const char kIccidProperty[] = "Cellular.ICCID";
+const char kImsiProperty[] = "Cellular.IMSI";
+const char kEsnProperty[] = "Cellular.ESN";
+const char kMdnProperty[] = "Cellular.MDN";
+const char kMinProperty[] = "Cellular.MIN";
+const char kModelIDProperty[] = "Cellular.ModelID";
+const char kManufacturerProperty[] = "Cellular.Manufacturer";
+const char kFirmwareRevisionProperty[] = "Cellular.FirmwareRevision";
+const char kHardwareRevisionProperty[] = "Cellular.HardwareRevision";
+const char kPRLVersionProperty[] = "Cellular.PRLVersion";
+const char kSelectedNetworkProperty[] = "Cellular.SelectedNetwork";
+const char kSupportNetworkScanProperty[] = "Cellular.SupportNetworkScan";
+const char kFoundNetworksProperty[] = "Cellular.FoundNetworks";
+
+// Flimflam state options.
+const char kStateIdle[] = "idle";
+const char kStateCarrier[] = "carrier";
+const char kStateAssociation[] = "association";
+const char kStateConfiguration[] = "configuration";
+const char kStateReady[] = "ready";
+const char kStatePortal[] = "portal";
+const char kStateOffline[] = "offline";
+const char kStateOnline[] = "online";
+const char kStateDisconnect[] = "disconnect";
+const char kStateFailure[] = "failure";
+const char kStateActivationFailure[] = "activation-failure";
+
+// Flimflam portal phase and status.
+const char kPortalDetectionPhaseConnection[] = "Connection";
+const char kPortalDetectionPhaseDns[] = "DNS";
+const char kPortalDetectionPhaseHttp[] = "HTTP";
+const char kPortalDetectionPhaseContent[] = "Content";
+const char kPortalDetectionPhaseUnknown[] = "Unknown";
+const char kPortalDetectionStatusFailure[] = "Failure";
+const char kPortalDetectionStatusTimeout[] = "Timeout";
+const char kPortalDetectionStatusSuccess[] = "Success";
+
+// Flimflam property names for SIMLock status.
+const char kSIMLockStatusProperty[] = "Cellular.SIMLockStatus";
+const char kSIMLockTypeProperty[] = "LockType";
+const char kSIMLockRetriesLeftProperty[] = "RetriesLeft";
+const char kSIMLockEnabledProperty[] = "LockEnabled";
+
+// Flimflam property names for Cellular.FoundNetworks.
+const char kLongNameProperty[] = "long_name";
+const char kStatusProperty[] = "status";
+const char kShortNameProperty[] = "short_name";
+const char kTechnologyProperty[] = "technology";
+const char kNetworkIdProperty[] = "network_id";
+
+// Flimflam SIMLock status types.
+const char kSIMLockPin[] = "sim-pin";
+const char kSIMLockPuk[] = "sim-puk";
+
+// APN info property names.
+const char kApnProperty[] = "apn";
+const char kApnNetworkIdProperty[] = "network_id";
+const char kApnUsernameProperty[] = "username";
+const char kApnPasswordProperty[] = "password";
+const char kApnNameProperty[] = "name";
+const char kApnLocalizedNameProperty[] = "localized_name";
+const char kApnLanguageProperty[] = "language";
+
+// Payment Portal property names.
+const char kPaymentPortalURL[] = "url";
+const char kPaymentPortalMethod[] = "method";
+const char kPaymentPortalPostData[] = "postdata";
+
+// Operator info property names.
+const char kOperatorNameKey[] = "name";
+const char kOperatorCodeKey[] = "code";
+const char kOperatorCountryKey[] = "country";
+
+// Flimflam network technology options.
+const char kNetworkTechnology1Xrtt[] = "1xRTT";
+const char kNetworkTechnologyEvdo[] = "EVDO";
+const char kNetworkTechnologyGsm[] = "GSM";
+const char kNetworkTechnologyGprs[] = "GPRS";
+const char kNetworkTechnologyEdge[] = "EDGE";
+const char kNetworkTechnologyUmts[] = "UMTS";
+const char kNetworkTechnologyHspa[] = "HSPA";
+const char kNetworkTechnologyHspaPlus[] = "HSPA+";
+const char kNetworkTechnologyLte[] = "LTE";
+const char kNetworkTechnologyLteAdvanced[] = "LTE Advanced";
+
+// Flimflam roaming state options
+const char kRoamingStateHome[] = "home";
+const char kRoamingStateRoaming[] = "roaming";
+const char kRoamingStateUnknown[] = "unknown";
+
+// Flimflam activation state options
+const char kActivationStateActivated[] = "activated";
+const char kActivationStateActivating[] = "activating";
+const char kActivationStateNotActivated[] = "not-activated";
+const char kActivationStatePartiallyActivated[] = "partially-activated";
+const char kActivationStateUnknown[] = "unknown";
+
+// Flimflam EAP method options.
+const char kEapMethodPEAP[] = "PEAP";
+const char kEapMethodTLS[] = "TLS";
+const char kEapMethodTTLS[] = "TTLS";
+const char kEapMethodLEAP[] = "LEAP";
+
+// Flimflam EAP phase 2 auth options.
+const char kEapPhase2AuthPEAPMD5[] = "auth=MD5";
+const char kEapPhase2AuthPEAPMSCHAPV2[] = "auth=MSCHAPV2";
+const char kEapPhase2AuthPEAPGTC[] = "auth=GTC";
+const char kEapPhase2AuthTTLSMD5[] = "autheap=MD5";  // crosbug/26822
+const char kEapPhase2AuthTTLSEAPMD5[] = "autheap=MD5";
+const char kEapPhase2AuthTTLSEAPMSCHAPV2[] = "autheap=MSCHAPV2";
+const char kEapPhase2AuthTTLSMSCHAPV2[] = "auth=MSCHAPV2";
+const char kEapPhase2AuthTTLSMSCHAP[] = "auth=MSCHAP";
+const char kEapPhase2AuthTTLSPAP[] = "auth=PAP";
+const char kEapPhase2AuthTTLSCHAP[] = "auth=CHAP";
+const char kEapPhase2AuthTTLSGTC[] = "auth=GTC";
+const char kEapPhase2AuthTTLSEAPGTC[] = "autheap=GTC";
+
+// Flimflam VPN provider types.
+const char kProviderL2tpIpsec[] = "l2tpipsec";
+const char kProviderOpenVpn[] = "openvpn";
+const char kProviderThirdPartyVpn[] = "thirdpartyvpn";
+
+// Flimflam VPN service properties
+const char kVPNDomainProperty[] = "VPN.Domain";
+
+// Flimflam monitored properties
+const char kMonitorPropertyChanged[] = "PropertyChanged";
+
+// Flimflam type options.
+const char kTypeEthernet[] = "ethernet";
+const char kTypeWifi[] = "wifi";
+const char kTypeWimax[] = "wimax";
+const char kTypeBluetooth[] = "bluetooth";
+const char kTypeCellular[] = "cellular";
+const char kTypeVPN[] = "vpn";
+const char kTypePPPoE[] = "pppoe";
+
+// Flimflam mode options.
+const char kModeManaged[] = "managed";
+const char kModeAdhoc[] = "adhoc";
+
+// Flimflam security options.
+const char kSecurityWpa[] = "wpa";
+const char kSecurityWep[] = "wep";
+const char kSecurityRsn[] = "rsn";
+const char kSecurity8021x[] = "802_1x";
+const char kSecurityPsk[] = "psk";
+const char kSecurityNone[] = "none";
+
+// Flimflam L2TPIPsec property names.
+const char kL2tpIpsecAuthenticationType[] = "L2TPIPsec.AuthenticationType";
+const char kL2tpIpsecCaCertNssProperty[] = "L2TPIPsec.CACertNSS";
+const char kL2tpIpsecClientCertIdProperty[] = "L2TPIPsec.ClientCertID";
+const char kL2tpIpsecClientCertSlotProperty[] = "L2TPIPsec.ClientCertSlot";
+const char kL2tpIpsecIkeVersion[] = "L2TPIPsec.IKEVersion";
+const char kL2tpIpsecPinProperty[] = "L2TPIPsec.PIN";
+const char kL2tpIpsecPskProperty[] = "L2TPIPsec.PSK";
+const char kL2tpIpsecPskRequiredProperty[] = "L2TPIPsec.PSKRequired";
+const char kL2tpIpsecUserProperty[] = "L2TPIPsec.User";
+const char kL2tpIpsecPasswordProperty[] = "L2TPIPsec.Password";
+
+// Flimflam OpenVPN property names.
+const char kOpenVPNAuthNoCacheProperty[] = "OpenVPN.AuthNoCache";
+const char kOpenVPNAuthProperty[] = "OpenVPN.Auth";
+const char kOpenVPNAuthRetryProperty[] = "OpenVPN.AuthRetry";
+const char kOpenVPNAuthUserPassProperty[] = "OpenVPN.AuthUserPass";
+const char kOpenVPNCaCertProperty[] = "OpenVPN.CACert";
+const char kOpenVPNCaCertNSSProperty[] = "OpenVPN.CACertNSS";
+const char kOpenVPNClientCertIdProperty[] = "OpenVPN.Pkcs11.ID";
+const char kOpenVPNClientCertSlotProperty[] = "OpenVPN.Pkcs11.Slot";
+const char kOpenVPNCipherProperty[] = "OpenVPN.Cipher";
+const char kOpenVPNCompLZOProperty[] = "OpenVPN.CompLZO";
+const char kOpenVPNCompNoAdaptProperty[] = "OpenVPN.CompNoAdapt";
+const char kOpenVPNIgnoreDefaultRouteProperty[] = "OpenVPN.IgnoreDefaultRoute";
+const char kOpenVPNKeyDirectionProperty[] = "OpenVPN.KeyDirection";
+const char kOpenVPNMgmtEnableProperty[] = "OpenVPN.Mgmt.Enable";
+const char kOpenVPNNsCertTypeProperty[] = "OpenVPN.NsCertType";
+const char kOpenVPNOTPProperty[] = "OpenVPN.OTP";
+const char kOpenVPNPasswordProperty[] = "OpenVPN.Password";
+const char kOpenVPNPinProperty[] = "OpenVPN.Pkcs11.PIN";
+const char kOpenVPNPortProperty[] = "OpenVPN.Port";
+const char kOpenVPNProtoProperty[] = "OpenVPN.Proto";
+const char kOpenVPNProviderProperty[] = "OpenVPN.Pkcs11.Provider";
+const char kOpenVPNPushPeerInfoProperty[] = "OpenVPN.PushPeerInfo";
+const char kOpenVPNRemoteCertEKUProperty[] = "OpenVPN.RemoteCertEKU";
+const char kOpenVPNRemoteCertKUProperty[] = "OpenVPN.RemoteCertKU";
+const char kOpenVPNRemoteCertTLSProperty[] = "OpenVPN.RemoteCertTLS";
+const char kOpenVPNRenegSecProperty[] = "OpenVPN.RenegSec";
+const char kOpenVPNServerPollTimeoutProperty[] = "OpenVPN.ServerPollTimeout";
+const char kOpenVPNShaperProperty[] = "OpenVPN.Shaper";
+const char kOpenVPNStaticChallengeProperty[] = "OpenVPN.StaticChallenge";
+const char kOpenVPNTLSAuthContentsProperty[] = "OpenVPN.TLSAuthContents";
+const char kOpenVPNTLSRemoteProperty[] = "OpenVPN.TLSRemote";
+const char kOpenVPNUserProperty[] = "OpenVPN.User";
+
+// FlimFlam PPPoE property names.
+const char kPPPoEUsernameProperty[] = "PPPoE.Username";
+const char kPPPoEPasswordProperty[] = "PPPoE.Password";
+const char kPPPoELCPEchoIntervalProperty[] = "PPPoE.LCPEchoInterval";
+const char kPPPoELCPEchoFailureProperty[] = "PPPoE.LCPEchoFailure";
+const char kPPPoEMaxAuthFailureProperty[] = "PPPoE.MaxAuthFailure";
+
+// FlimFlam technology family options
+const char kTechnologyFamilyCdma[] = "CDMA";
+const char kTechnologyFamilyGsm[] = "GSM";
+
+// IPConfig property names.
+const char kMethodProperty[] = "Method";
+const char kAddressProperty[] = "Address";
+const char kMtuProperty[] = "Mtu";
+const char kPrefixlenProperty[] = "Prefixlen";
+const char kBroadcastProperty[] = "Broadcast";
+const char kPeerAddressProperty[] = "PeerAddress";
+const char kGatewayProperty[] = "Gateway";
+const char kDomainNameProperty[] = "DomainName";
+const char kAcceptedHostnameProperty[] = "AcceptedHostname";
+const char kNameServersProperty[] = "NameServers";
+const char kDelegatedPrefixProperty[] = "DelegatedPrefix";
+const char kDelegatedPrefixLengthProperty[] = "DelegatedPrefixLength";
+
+// IPConfig type options.
+const char kTypeIPv4[] = "ipv4";
+const char kTypeIPv6[] = "ipv6";
+const char kTypeDHCP[] = "dhcp";
+const char kTypeBOOTP[] = "bootp";
+const char kTypeZeroConf[] = "zeroconf";
+const char kTypeDHCP6[] = "dhcp6";
+const char kTypePPP[] = "ppp";
+
+// Flimflam error options.
+const char kErrorAaaFailed[] = "aaa-failed";
+const char kErrorActivationFailed[] = "activation-failed";
+const char kErrorBadPassphrase[] = "bad-passphrase";
+const char kErrorBadWEPKey[] = "bad-wepkey";
+const char kErrorConnectFailed[] = "connect-failed";
+const char kErrorDNSLookupFailed[] = "dns-lookup-failed";
+const char kErrorDhcpFailed[] = "dhcp-failed";
+const char kErrorHTTPGetFailed[] = "http-get-failed";
+const char kErrorInternal[] = "internal-error";
+const char kErrorIpsecCertAuthFailed[] = "ipsec-cert-auth-failed";
+const char kErrorIpsecPskAuthFailed[] = "ipsec-psk-auth-failed";
+const char kErrorNeedEvdo[] = "need-evdo";
+const char kErrorNeedHomeNetwork[] = "need-home-network";
+const char kErrorOtaspFailed[] = "otasp-failed";
+const char kErrorOutOfRange[] = "out-of-range";
+const char kErrorPinMissing[] = "pin-missing";
+const char kErrorPppAuthFailed[] = "ppp-auth-failed";
+
+// Flimflam error result codes.
+const char kErrorResultSuccess[] = "org.chromium.flimflam.Error.Success";
+const char kErrorResultFailure[] = "org.chromium.flimflam.Error.Failure";
+const char kErrorResultAlreadyConnected[] =
+    "org.chromium.flimflam.Error.AlreadyConnected";
+const char kErrorResultAlreadyExists[] =
+    "org.chromium.flimflam.Error.AlreadyExists";
+const char kErrorResultIncorrectPin[] =
+     "org.chromium.flimflam.Error.IncorrectPin";
+const char kErrorResultInProgress[] = "org.chromium.flimflam.Error.InProgress";
+const char kErrorResultInternalError[] =
+    "org.chromium.flimflam.Error.InternalError";
+const char kErrorResultInvalidApn[] = "org.chromium.flimflam.Error.InvalidApn";
+const char kErrorResultInvalidArguments[] =
+    "org.chromium.flimflam.Error.InvalidArguments";
+const char kErrorResultInvalidNetworkName[] =
+    "org.chromium.flimflam.Error.InvalidNetworkName";
+const char kErrorResultInvalidPassphrase[] =
+    "org.chromium.flimflam.Error.InvalidPassphrase";
+const char kErrorResultInvalidProperty[] =
+    "org.chromium.flimflam.Error.InvalidProperty";
+const char kErrorResultNoCarrier[] = "org.chromium.flimflam.Error.NoCarrier";
+const char kErrorResultNotConnected[] =
+     "org.chromium.flimflam.Error.NotConnected";
+const char kErrorResultNotFound[] = "org.chromium.flimflam.Error.NotFound";
+const char kErrorResultNotImplemented[] =
+    "org.chromium.flimflam.Error.NotImplemented";
+const char kErrorResultNotOnHomeNetwork[] =
+    "org.chromium.flimflam.Error.NotOnHomeNetwork";
+const char kErrorResultNotRegistered[] =
+    "org.chromium.flimflam.Error.NotRegistered";
+const char kErrorResultNotSupported[] =
+     "org.chromium.flimflam.Error.NotSupported";
+const char kErrorResultOperationAborted[] =
+    "org.chromium.flimflam.Error.OperationAborted";
+const char kErrorResultOperationInitiated[] =
+    "org.chromium.flimflam.Error.OperationInitiated";
+const char kErrorResultOperationTimeout[] =
+    "org.chromium.flimflam.Error.OperationTimeout";
+const char kErrorResultPassphraseRequired[] =
+    "org.chromium.flimflam.Error.PassphraseRequired";
+const char kErrorResultPermissionDenied[] =
+    "org.chromium.flimflam.Error.PermissionDenied";
+const char kErrorResultPinBlocked[] = "org.chromium.flimflam.Error.PinBlocked";
+const char kErrorResultPinRequired[] =
+     "org.chromium.flimflam.Error.PinRequired";
+const char kErrorResultWrongState[] = "org.chromium.flimflam.Error.WrongState";
+
+const char kUnknownString[] = "UNKNOWN";
+
+// Function names.
+const char kClearPropertiesFunction[] = "ClearProperties";
+const char kCompleteCellularActivationFunction[] = "CompleteCellularActivation";
+const char kConfigureServiceForProfileFunction[] = "ConfigureServiceForProfile";
+const char kConnectToBestServicesFunction[] = "ConnectToBestServices";
+const char kCreateConnectivityReportFunction[] = "CreateConnectivityReport";
+const char kAddWakeOnPacketConnectionFunction[] = "AddWakeOnPacketConnection";
+const char kRemoveWakeOnPacketConnectionFunction[] =
+    "RemoveWakeOnPacketConnection";
+const char kRemoveAllWakeOnPacketConnectionsFunction[] =
+    "RemoveAllWakeOnPacketConnections";
+const char kGetLoadableProfileEntriesFunction[] = "GetLoadableProfileEntries";
+const char kGetNetworksForGeolocation[] = "GetNetworksForGeolocation";
+const char kPerformTDLSOperationFunction[] = "PerformTDLSOperation";
+const char kRefreshFunction[] = "Refresh";
+const char kResetFunction[] = "Reset";
+const char kSetCarrierFunction[] = "SetCarrier";
+const char kSetPropertiesFunction[] = "SetProperties";
+const char kVerifyAndEncryptCredentialsFunction[] =
+    "VerifyAndEncryptCredentials";
+const char kVerifyAndEncryptDataFunction[] = "VerifyAndEncryptData";
+const char kVerifyDestinationFunction[] = "VerifyDestination";
+
+// ThirdPartyVpn functions.
+const char kSetParametersFunction[] = "SetParameters";
+const char kSendPacketFunction[] = "SendPacket";
+const char kUpdateConnectionStateFunction[] = "UpdateConnectionState";
+const char kOnPacketReceivedFunction[] = "OnPacketReceived";
+const char kOnPlatformMessageFunction[] = "OnPlatformMessage";
+
+// Device property names.
+const char kEapAuthenticationCompletedProperty[] = "EapAuthenticationCompleted";
+const char kEapAuthenticatorDetectedProperty[] = "EapAuthenticatorDetected";
+const char kLinkMonitorResponseTimeProperty[] = "LinkMonitorResponseTime";
+const char kLinkUpProperty[] = "Ethernet.LinkUp";
+const char kProviderRequiresRoamingProperty[] =
+    "Cellular.ProviderRequiresRoaming";
+const char kPPPoEProperty[] = "Ethernet.PPPoE";
+const char kReceiveByteCountProperty[] = "ReceiveByteCount";
+const char kSIMPresentProperty[] = "Cellular.SIMPresent";
+const char kSupportedCarriersProperty[] = "Cellular.SupportedCarriers";
+const char kTransmitByteCountProperty[] = "TransmitByteCount";
+
+// Technology types (augments "Flimflam type options" above).
+const char kTypeEthernetEap[] = "etherneteap";
+
+// Error strings.
+const char kErrorEapAuthenticationFailed[] = "eap-authentication-failed";
+const char kErrorEapLocalTlsFailed[] = "eap-local-tls-failed";
+const char kErrorEapRemoteTlsFailed[] = "eap-remote-tls-failed";
+
+// IPConfig property names.
+const char kSearchDomainsProperty[] = "SearchDomains";
+const char kVendorEncapsulatedOptionsProperty[] = "VendorEncapsulatedOptions";
+const char kWebProxyAutoDiscoveryUrlProperty[] = "WebProxyAutoDiscoveryUrl";
+
+// Manager property names.
+const char kDefaultServiceProperty[] = "DefaultService";
+const char kDisableWiFiVHTProperty[] = "DisableWiFiVHT";
+const char kHostNameProperty[] = "HostName";
+const char kIgnoredDNSSearchPathsProperty[] = "IgnoredDNSSearchPaths";
+const char kLinkMonitorTechnologiesProperty[] =
+    "LinkMonitorTechnologies";
+const char kNoAutoConnectTechnologiesProperty[] = "NoAutoConnectTechnologies";
+const char kPortalCheckIntervalProperty[] = "PortalCheckInterval";
+const char kProhibitedTechnologiesProperty[] = "ProhibitedTechnologies";
+const char kServiceCompleteListProperty[] = "ServiceCompleteList";
+const char kShortDNSTimeoutTechnologiesProperty[] =
+    "ShortDNSTimeoutTechnologies";
+const char kUninitializedTechnologiesProperty[] = "UninitializedTechnologies";
+const char kWakeOnLanEnabledProperty[] = "WakeOnLanEnabled";
+const char kWakeOnWiFiFeaturesEnabledProperty[] = "WakeOnWiFiFeaturesEnabled";
+
+// Service property names.
+const char kActivationTypeProperty[] = "Cellular.ActivationType";
+const char kDiagnosticsDisconnectsProperty[] = "Diagnostics.Disconnects";
+const char kDiagnosticsMisconnectsProperty[] = "Diagnostics.Misconnects";
+const char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
+const char kEapCaCertPemProperty[] = "EAP.CACertPEM";
+const char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
+const char kErrorDetailsProperty[] = "ErrorDetails";
+const char kHTTPProxyPortProperty[] = "HTTPProxyPort";
+const char kIPConfigProperty[] = "IPConfig";
+const char kL2tpIpsecCaCertPemProperty[] = "L2TPIPsec.CACertPEM";
+const char kL2tpIpsecTunnelGroupProperty[] = "L2TPIPsec.TunnelGroup";
+const char kL2tpIpsecXauthPasswordProperty[] = "L2TPIPsec.XauthPassword";
+const char kL2tpIpsecXauthUserProperty[] = "L2TPIPsec.XauthUser";
+const char kL2tpIpsecLcpEchoDisabledProperty[] = "L2TPIPsec.LCPEchoDisabled";
+const char kManagedCredentialsProperty[] = "ManagedCredentials";
+const char kOpenVPNCaCertPemProperty[] = "OpenVPN.CACertPEM";
+const char kOpenVPNCertProperty[] = "OpenVPN.Cert";
+const char kOpenVPNExtraCertPemProperty[] = "OpenVPN.ExtraCertPEM";
+const char kOpenVPNKeyProperty[] = "OpenVPN.Key";
+const char kOpenVPNPingProperty[] = "OpenVPN.Ping";
+const char kOpenVPNPingExitProperty[] = "OpenVPN.PingExit";
+const char kOpenVPNPingRestartProperty[] = "OpenVPN.PingRestart";
+const char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
+const char kOpenVPNTokenProperty[] = "OpenVPN.Token";
+const char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
+const char kOpenVPNVerifyHashProperty[] = "OpenVPN.VerifyHash";
+const char kOpenVPNVerifyX509NameProperty[] = "OpenVPN.VerifyX509Name";
+const char kOpenVPNVerifyX509TypeProperty[] = "OpenVPN.VerifyX509Type";
+const char kOutOfCreditsProperty[] = "Cellular.OutOfCredits";
+const char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
+const char kPreviousErrorProperty[] = "PreviousError";
+const char kPreviousErrorSerialNumberProperty[] = "PreviousErrorSerialNumber";
+const char kStaticIPAddressProperty[] = "StaticIP.Address";
+const char kStaticIPGatewayProperty[] = "StaticIP.Gateway";
+const char kStaticIPMtuProperty[] = "StaticIP.Mtu";
+const char kStaticIPNameServersProperty[] = "StaticIP.NameServers";
+const char kStaticIPPeerAddressProperty[] = "StaticIP.PeerAddress";
+const char kStaticIPPrefixlenProperty[] = "StaticIP.Prefixlen";
+const char kSavedIPAddressProperty[] = "SavedIP.Address";
+const char kSavedIPGatewayProperty[] = "SavedIP.Gateway";
+const char kSavedIPMtuProperty[] = "SavedIP.Mtu";
+const char kSavedIPNameServersProperty[] = "SavedIP.NameServers";
+const char kSavedIPPeerAddressProperty[] = "SavedIP.PeerAddress";
+const char kSavedIPPrefixlenProperty[] = "SavedIP.Prefixlen";
+const char kTetheringProperty[] = "Tethering";
+const char kVPNMTUProperty[] = "VPN.MTU";
+const char kWifiFrequencyListProperty[] = "WiFi.FrequencyList";
+const char kWifiVendorInformationProperty[] = "WiFi.VendorInformation";
+const char kWifiProtectedManagementFrameRequiredProperty[] =
+    "WiFi.ProtectedManagementFrameRequired";
+
+// Profile property names.
+const char kUserHashProperty[] = "UserHash";
+
+// Service Tethering property values.
+const char kTetheringNotDetectedState[] = "NotDetected";
+const char kTetheringSuspectedState[] = "Suspected";
+const char kTetheringConfirmedState[] = "Confirmed";
+
+// WiFi Service Vendor Information dictionary properties.
+const char kVendorWPSManufacturerProperty[] = "Manufacturer";
+const char kVendorWPSModelNameProperty[] = "ModelName";
+const char kVendorWPSModelNumberProperty[] = "ModelNumber";
+const char kVendorWPSDeviceNameProperty[] = "DeviceName";
+const char kVendorOUIListProperty[] = "OUIList";
+
+// WiFi Device link property names.
+const char kLinkStatisticsProperty[] = "LinkStatistics";
+const char kAverageReceiveSignalDbmProperty[] = "AverageReceiveSignalDbm";
+const char kInactiveTimeMillisecondsProperty[] =
+    "InactiveTimeMilliseconds";
+const char kLastReceiveSignalDbmProperty[] = "LastReceiveSignalDbm";
+const char kPacketReceiveSuccessesProperty[] = "PacketReceiveSuccesses";
+const char kPacketTransmitFailuresProperty[] = "PacketTransmitFailures";
+const char kPacketTransmitSuccessesProperty[] = "PacketTrasmitSuccesses";
+const char kTransmitBitrateProperty[] = "TransmitBitrate";
+const char kTransmitRetriesProperty[] = "TransmitRetries";
+
+// WiFi TDLS operations.
+const char kTDLSDiscoverOperation[] = "Discover";
+const char kTDLSSetupOperation[] = "Setup";
+const char kTDLSStatusOperation[] = "Status";
+const char kTDLSTeardownOperation[] = "Teardown";
+
+// WiFi TDLS states.
+const char kTDLSConnectedState[] = "Connected";
+const char kTDLSDisabledState[] = "Disabled";
+const char kTDLSDisconnectedState[] = "Disconnected";
+const char kTDLSNonexistentState[] = "Nonexistent";
+const char kTDLSUnknownState[] = "Unknown";
+
+// Wake on WiFi features.
+const char kWakeOnWiFiFeaturesEnabledPacket[] = "packet";
+const char kWakeOnWiFiFeaturesEnabledSSID[] = "ssid";
+const char kWakeOnWiFiFeaturesEnabledPacketSSID[] = "packet_and_ssid";
+const char kWakeOnWiFiFeaturesEnabledNone[] = "none";
+const char kWakeOnWiFiFeaturesEnabledNotSupported[] = "not_supported";
+
+// Cellular service carriers.
+const char kCarrierGenericUMTS[] = "Generic UMTS";
+const char kCarrierSprint[] = "Sprint";
+const char kCarrierVerizon[] = "Verizon Wireless";
+
+// Cellular activation types.
+const char kActivationTypeNonCellular[] = "NonCellular";  // For future use
+const char kActivationTypeOMADM[] = "OMADM";  // For future use
+const char kActivationTypeOTA[] = "OTA";
+const char kActivationTypeOTASP[] = "OTASP";
+
+// Geolocation property field names.
+// Reference:
+//    https://devsite.googleplex.com/maps/documentation/business/geolocation/
+// Top level properties for a Geolocation request.
+const char kGeoHomeMobileCountryCodeProperty[] = "homeMobileCountryCode";
+const char kGeoHomeMobileNetworkCodeProperty[] = "homeMobileNetworkCode";
+const char kGeoRadioTypePropertyProperty[] = "radioType";
+const char kGeoCellTowersProperty[] = "cellTowers";
+const char kGeoWifiAccessPointsProperty[] = "wifiAccessPoints";
+// Cell tower object property names.
+const char kGeoCellIdProperty[] = "cellId";
+const char kGeoLocationAreaCodeProperty[] = "locationAreaCode";
+const char kGeoMobileCountryCodeProperty[] = "mobileCountryCode";
+const char kGeoMobileNetworkCodeProperty[] = "mobileNetworkCode";
+const char kGeoTimingAdvanceProperty[] = "timingAdvance";
+// WiFi access point property names.
+const char kGeoMacAddressProperty[] = "macAddress";
+const char kGeoChannelProperty[] = "channel";
+const char kGeoSignalToNoiseRatioProperty[] = "signalToNoiseRatio";
+// Common property names for geolocation objects.
+const char kGeoAgeProperty[] = "age";
+const char kGeoSignalStrengthProperty[] = "signalStrength";
+// ThirdPartyVpn parameters, properties and constants.
+const char kAddressParameterThirdPartyVpn[] = "address";
+const char kBroadcastAddressParameterThirdPartyVpn[] = "broadcast_address";
+const char kGatewayParameterThirdPartyVpn[] = "gateway";
+const char kBypassTunnelForIpParameterThirdPartyVpn[] = "bypass_tunnel_for_ip";
+const char kSubnetPrefixParameterThirdPartyVpn[] = "subnet_prefix";
+const char kMtuParameterThirdPartyVpn[] = "mtu";
+const char kDomainSearchParameterThirdPartyVpn[] = "domain_search";
+const char kDnsServersParameterThirdPartyVpn[] = "dns_servers";
+const char kInclusionListParameterThirdPartyVpn[] = "inclusion_list";
+const char kExclusionListParameterThirdPartyVpn[] = "exclusion_list";
+const char kObjectPathSuffixProperty[] = "ObjectPathSuffix";
+const char kExtensionNameProperty[] = "ExtensionName";
+const char kConfigurationNameProperty[] = "ConfigurationName";
+const char kObjectPathBase[] = "/thirdpartyvpn/";
+const char kNonIPDelimiter = ':';
+const char kIPDelimiter = ' ';
+}  // namespace shill
+
+#endif  // SYSTEM_API_DBUS_SHILL_DBUS_CONSTANTS_H_
diff --git a/dbus/update_engine/dbus-constants.h b/dbus/update_engine/dbus-constants.h
new file mode 100644
index 0000000..a580bd0
--- /dev/null
+++ b/dbus/update_engine/dbus-constants.h
@@ -0,0 +1,42 @@
+// Copyright 2015 The Chromium OS 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 SYSTEM_API_DBUS_UPDATE_ENGINE_DBUS_CONSTANTS_H_
+#define SYSTEM_API_DBUS_UPDATE_ENGINE_DBUS_CONSTANTS_H_
+
+namespace update_engine {
+const char kUpdateEngineInterface[] = "org.chromium.UpdateEngineInterface";
+const char kUpdateEngineServicePath[] = "/org/chromium/UpdateEngine";
+const char kUpdateEngineServiceName[] = "org.chromium.UpdateEngine";
+
+// Methods.
+const char kAttemptUpdate[] = "AttemptUpdate";
+const char kGetStatus[] = "GetStatus";
+const char kRebootIfNeeded[] = "RebootIfNeeded";
+const char kSetChannel[] = "SetChannel";
+const char kGetChannel[] = "GetChannel";
+const char kAttemptRollback[] = "AttemptRollback";
+const char kCanRollback[] = "CanRollback";
+
+// Signals.
+const char kStatusUpdate[] = "StatusUpdate";
+
+// Operations contained in StatusUpdate signals.
+const char kUpdateStatusIdle[] = "UPDATE_STATUS_IDLE";
+const char kUpdateStatusCheckingForUpdate[] =
+    "UPDATE_STATUS_CHECKING_FOR_UPDATE";
+const char kUpdateStatusUpdateAvailable[] = "UPDATE_STATUS_UPDATE_AVAILABLE";
+const char kUpdateStatusDownloading[] = "UPDATE_STATUS_DOWNLOADING";
+const char kUpdateStatusVerifying[] = "UPDATE_STATUS_VERIFYING";
+const char kUpdateStatusFinalizing[] = "UPDATE_STATUS_FINALIZING";
+const char kUpdateStatusUpdatedNeedReboot[] =
+    "UPDATE_STATUS_UPDATED_NEED_REBOOT";
+const char kUpdateStatusReportingErrorEvent[] =
+    "UPDATE_STATUS_REPORTING_ERROR_EVENT";
+const char kUpdateStatusAttemptingRollback[] =
+    "UPDATE_STATUS_ATTEMPTING_ROLLBACK";
+const char kUpdateStatusDisabled[] = "UPDATE_STATUS_DISABLED";
+}  // namespace update_engine
+
+#endif  // SYSTEM_API_DBUS_UPDATE_ENGINE_DBUS_CONSTANTS_H_