Index: chrome/browser/chromeos/login/owner_manager_unittest.cc |
diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc |
index 98b8fc5eee582c914f598a71d2c93e04298ef301..db25a935c57f230c9a6d4ee2926a526abfb284ba 100644 |
--- a/chrome/browser/chromeos/login/owner_manager_unittest.cc |
+++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc |
@@ -136,74 +136,6 @@ TEST_F(OwnerManagerTest, LoadOwnerKey) { |
message_loop_.Run(); |
} |
-TEST_F(OwnerManagerTest, KeyGenerationFail) { |
- StartUnowned(); |
- MockKeyLoadObserver loader; |
- loader.ExpectKeyFetchSuccess(false); |
- scoped_refptr<OwnerManager> manager(new OwnerManager); |
- |
- EXPECT_CALL(*mock_, GenerateKeyPair()) |
- .WillOnce(Return(reinterpret_cast<RSAPrivateKey*>(NULL))) |
- .RetiresOnSaturation(); |
- EXPECT_CALL(*mock_, GetOwnerKeyFilePath()) |
- .WillRepeatedly(Return(tmpfile_)); |
- |
- BrowserThread::PostTask( |
- BrowserThread::FILE, FROM_HERE, |
- NewRunnableMethod(manager.get(), |
- &OwnerManager::GenerateKeysAndExportPublic)); |
- |
- message_loop_.Run(); |
-} |
- |
-TEST_F(OwnerManagerTest, KeyExportFail) { |
- StartUnowned(); |
- MockKeyLoadObserver loader; |
- loader.ExpectKeyFetchSuccess(false); |
- scoped_refptr<OwnerManager> manager(new OwnerManager); |
- |
- EXPECT_CALL(*mock_, ExportPublicKeyViaDbus(fake_private_key_.get(), |
- manager.get())) |
- .WillOnce(Invoke(MockKeyUtils::ExportPublicKeyViaDbusFail)) |
- .RetiresOnSaturation(); |
- EXPECT_CALL(*mock_, GenerateKeyPair()) |
- .WillOnce(Return(fake_private_key_.release())) |
- .RetiresOnSaturation(); |
- EXPECT_CALL(*mock_, GetOwnerKeyFilePath()) |
- .WillRepeatedly(Return(tmpfile_)); |
- |
- BrowserThread::PostTask( |
- BrowserThread::FILE, FROM_HERE, |
- NewRunnableMethod(manager.get(), |
- &OwnerManager::GenerateKeysAndExportPublic)); |
- |
- message_loop_.Run(); |
-} |
- |
-TEST_F(OwnerManagerTest, TakeOwnership) { |
- StartUnowned(); |
- MockKeyLoadObserver loader; |
- loader.ExpectKeyFetchSuccess(true); |
- scoped_refptr<OwnerManager> manager(new OwnerManager); |
- |
- EXPECT_CALL(*mock_, ExportPublicKeyViaDbus(fake_private_key_.get(), |
- manager.get())) |
- .WillOnce(Invoke(MockKeyUtils::ExportPublicKeyViaDbusWin)) |
- .RetiresOnSaturation(); |
- EXPECT_CALL(*mock_, GenerateKeyPair()) |
- .WillOnce(Return(fake_private_key_.release())) |
- .RetiresOnSaturation(); |
- EXPECT_CALL(*mock_, GetOwnerKeyFilePath()) |
- .WillRepeatedly(Return(tmpfile_)); |
- |
- BrowserThread::PostTask( |
- BrowserThread::FILE, FROM_HERE, |
- NewRunnableMethod(manager.get(), |
- &OwnerManager::GenerateKeysAndExportPublic)); |
- |
- message_loop_.Run(); |
-} |
- |
TEST_F(OwnerManagerTest, GetKeyFailDuringVerify) { |
StartUnowned(); |
MockKeyLoadObserver loader; |