Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1202)

Unified Diff: chrome/browser/chromeos/login/owner_manager_unittest.cc

Issue 6538098: [Chrome OS] Owner keys are generated outside Chrome now; handle appropriately (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/owner_manager.cc ('k') | chrome/browser/chromeos/login/ownership_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/browser/chromeos/login/owner_manager.cc ('k') | chrome/browser/chromeos/login/ownership_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698