Index: chrome/browser/chromeos/cros/cryptohome_library.cc |
diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc |
index 5c38fca1de241c6a1840ddfa938a0d6164379f0a..4711dcf52fb1210eb4ac311fbc210ec43fe1326c 100644 |
--- a/chrome/browser/chromeos/cros/cryptohome_library.cc |
+++ b/chrome/browser/chromeos/cros/cryptohome_library.cc |
@@ -31,11 +31,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
cryptohome_connection_ = chromeos::CryptohomeMonitorSession(&Handler, this); |
} |
- virtual bool CheckKey( |
- const std::string& user_email, const std::string& passhash) OVERRIDE { |
- return chromeos::CryptohomeCheckKey(user_email.c_str(), passhash.c_str()); |
- } |
- |
virtual bool AsyncCheckKey(const std::string& user_email, |
const std::string& passhash, |
Delegate* d) OVERRIDE { |
@@ -45,14 +40,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
"Couldn't initiate async check of user's key."); |
} |
- virtual bool MigrateKey(const std::string& user_email, |
- const std::string& old_hash, |
- const std::string& new_hash) OVERRIDE { |
- return chromeos::CryptohomeMigrateKey(user_email.c_str(), |
- old_hash.c_str(), |
- new_hash.c_str()); |
- } |
- |
virtual bool AsyncMigrateKey(const std::string& user_email, |
const std::string& old_hash, |
const std::string& new_hash, |
@@ -65,14 +52,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
"Couldn't initiate aync migration of user's key"); |
} |
- virtual bool Mount(const std::string& user_email, |
- const std::string& passhash, |
- int* error_code) OVERRIDE { |
- return chromeos::CryptohomeMountAllowFail(user_email.c_str(), |
- passhash.c_str(), |
- error_code); |
- } |
- |
virtual bool AsyncMount(const std::string& user_email, |
const std::string& passhash, |
const bool create_if_missing, |
@@ -87,24 +66,12 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
"Couldn't initiate async mount of cryptohome."); |
} |
- virtual bool MountForBwsi(int* error_code) OVERRIDE { |
- return chromeos::CryptohomeMountGuest(error_code); |
- } |
- |
virtual bool AsyncMountForBwsi(Delegate* d) OVERRIDE { |
return CacheCallback(chromeos::CryptohomeAsyncMountGuest(), |
d, |
"Couldn't initiate async mount of cryptohome."); |
} |
- virtual bool Unmount() OVERRIDE { |
- return chromeos::CryptohomeUnmount(); |
- } |
- |
- virtual bool Remove(const std::string& user_email) OVERRIDE { |
- return chromeos::CryptohomeRemove(user_email.c_str()); |
- } |
- |
virtual bool AsyncRemove( |
const std::string& user_email, Delegate* d) OVERRIDE { |
return CacheCallback( |
@@ -134,13 +101,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
return system_salt; |
} |
- virtual bool AsyncDoAutomaticFreeDiskSpaceControl(Delegate* d) OVERRIDE { |
- return CacheCallback( |
- chromeos::CryptohomeAsyncDoAutomaticFreeDiskSpaceControl(), |
- d, |
- "Couldn't do automatic free disk space control."); |
- } |
- |
virtual bool AsyncSetOwnerUser( |
const std::string& username, Delegate* d) OVERRIDE { |
return CacheCallback( |
@@ -199,10 +159,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
value.c_str()); |
} |
- virtual int InstallAttributesCount() OVERRIDE { |
- return chromeos::CryptohomeInstallAttributesCount(); |
- } |
- |
virtual bool InstallAttributesFinalize() OVERRIDE { |
return chromeos::CryptohomeInstallAttributesFinalize(); |
} |
@@ -211,10 +167,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { |
return chromeos::CryptohomeInstallAttributesIsReady(); |
} |
- virtual bool InstallAttributesIsSecure() OVERRIDE { |
- return chromeos::CryptohomeInstallAttributesIsSecure(); |
- } |
- |
virtual bool InstallAttributesIsInvalid() OVERRIDE { |
return chromeos::CryptohomeInstallAttributesIsInvalid(); |
} |
@@ -277,11 +229,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
virtual void Init() OVERRIDE {} |
- virtual bool CheckKey( |
- const std::string& user_email, const std::string& passhash) OVERRIDE { |
- return true; |
- } |
- |
virtual bool AsyncCheckKey(const std::string& user_email, |
const std::string& passhash, |
Delegate* callback) OVERRIDE { |
@@ -291,12 +238,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return true; |
} |
- virtual bool MigrateKey(const std::string& user_email, |
- const std::string& old_hash, |
- const std::string& new_hash) OVERRIDE { |
- return true; |
- } |
- |
virtual bool AsyncMigrateKey(const std::string& user_email, |
const std::string& old_hash, |
const std::string& new_hash, |
@@ -307,20 +248,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return true; |
} |
- virtual bool Mount(const std::string& user_email, |
- const std::string& passhash, |
- int* error_code) OVERRIDE { |
- // For testing password change. |
- if (user_email == |
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
- switches::kLoginUserWithNewPassword)) { |
- *error_code = kCryptohomeMountErrorKeyFailure; |
- return false; |
- } |
- |
- return true; |
- } |
- |
virtual bool AsyncMount(const std::string& user_email, |
const std::string& passhash, |
const bool create_if_missing, |
@@ -331,10 +258,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return true; |
} |
- virtual bool MountForBwsi(int* error_code) OVERRIDE { |
- return true; |
- } |
- |
virtual bool AsyncMountForBwsi(Delegate* callback) OVERRIDE { |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, |
@@ -342,14 +265,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return true; |
} |
- virtual bool Unmount() OVERRIDE { |
- return true; |
- } |
- |
- virtual bool Remove(const std::string& user_email) OVERRIDE { |
- return true; |
- } |
- |
virtual bool AsyncRemove( |
const std::string& user_email, Delegate* callback) OVERRIDE { |
BrowserThread::PostTask( |
@@ -370,14 +285,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return salt; |
} |
- virtual bool AsyncDoAutomaticFreeDiskSpaceControl( |
- Delegate* callback) OVERRIDE { |
- BrowserThread::PostTask( |
- BrowserThread::UI, FROM_HERE, |
- base::Bind(&DoStubCallback, callback)); |
- return true; |
- } |
- |
virtual bool AsyncSetOwnerUser( |
const std::string& username, Delegate* callback) OVERRIDE { |
BrowserThread::PostTask( |
@@ -428,10 +335,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return true; |
} |
- virtual int InstallAttributesCount() OVERRIDE { |
- return install_attrs_.size(); |
- } |
- |
virtual bool InstallAttributesFinalize() OVERRIDE { |
locked_ = true; |
return true; |
@@ -441,10 +344,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { |
return true; |
} |
- virtual bool InstallAttributesIsSecure() OVERRIDE { |
- return false; |
- } |
- |
virtual bool InstallAttributesIsInvalid() OVERRIDE { |
return false; |
} |