diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 18:22:26 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 18:22:26 +0000 |
| commit | ee4e9f555a9099fbfc0f1ce1c30c294cc7081aa2 (patch) | |
| tree | 584fbaf27ca805ec0e568a468b8cd9eb08733949 /chromeos | |
| parent | 90878c568b925650ad98d781a00fead7d2a583e7 (diff) | |
| download | chromium_src-ee4e9f555a9099fbfc0f1ce1c30c294cc7081aa2.zip chromium_src-ee4e9f555a9099fbfc0f1ce1c30c294cc7081aa2.tar.gz chromium_src-ee4e9f555a9099fbfc0f1ce1c30c294cc7081aa2.tar.bz2 | |
Enable supervised users password sync/import on ChromeOS
R=nkostylev@chromium.org
TBR=stevenjb@chromium.org
as owner of chromeos/cryptohome/*
BUG=282464, 244472
Review URL: https://codereview.chromium.org/224343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 | ||||
| -rw-r--r-- | chromeos/cryptohome/mock_homedir_methods.cc | 2 | ||||
| -rw-r--r-- | chromeos/cryptohome/mock_homedir_methods.h | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 5b47f24..4942c72 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -204,8 +204,5 @@ const char kForceFirstRunUI[] = "force-first-run-ui"; // Enables testing for auto update UI. const char kTestAutoUpdateUI[] = "test-auto-update-ui"; -// Enables features required for supervised user sync, -const char kEnableSupervisedPasswordSync[] = "enable-supervised-password-sync"; - } // namespace switches } // namespace chromeos diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 097f9d6..48aee7a 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -73,7 +73,6 @@ CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; CHROMEOS_EXPORT extern const char kDisableSamlSignin[]; CHROMEOS_EXPORT extern const char kGAIAAuthExtensionManifest[]; CHROMEOS_EXPORT extern const char kTestAutoUpdateUI[]; -CHROMEOS_EXPORT extern const char kEnableSupervisedPasswordSync[]; } // namespace switches } // namespace chromeos diff --git a/chromeos/cryptohome/mock_homedir_methods.cc b/chromeos/cryptohome/mock_homedir_methods.cc index 9e6cdab..0cb4a38 100644 --- a/chromeos/cryptohome/mock_homedir_methods.cc +++ b/chromeos/cryptohome/mock_homedir_methods.cc @@ -28,6 +28,8 @@ void MockHomedirMethods::SetUp(bool success, MountError return_code) { WithArgs<4>(Invoke(this, &MockHomedirMethods::DoCallback))); ON_CALL(*this, UpdateKeyEx(_, _, _, _, _)).WillByDefault( WithArgs<4>(Invoke(this, &MockHomedirMethods::DoCallback))); + ON_CALL(*this, RemoveKeyEx(_, _, _, _)).WillByDefault( + WithArgs<3>(Invoke(this, &MockHomedirMethods::DoCallback))); } void MockHomedirMethods::DoCallback(const Callback& callback) { diff --git a/chromeos/cryptohome/mock_homedir_methods.h b/chromeos/cryptohome/mock_homedir_methods.h index e244c2f..450acd2 100644 --- a/chromeos/cryptohome/mock_homedir_methods.h +++ b/chromeos/cryptohome/mock_homedir_methods.h @@ -36,6 +36,11 @@ class CHROMEOS_EXPORT MockHomedirMethods : public HomedirMethods { const KeyDefinition& key, bool clobber_if_exist, const Callback& callback)); + MOCK_METHOD4(RemoveKeyEx, + void(const Identification& id, + const Authorization& auth, + const std::string& label, + const Callback& callback)); MOCK_METHOD5(UpdateKeyEx, void(const Identification& id, const Authorization& auth, |