Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chromeos / cert_loader_unittest.cc

diff --git a/src/chromeos/cert_loader_unittest.cc b/src/chromeos/cert_loader_unittest.cc
index fc47704..19765af 100644 (file)
--- a/src/chromeos/cert_loader_unittest.cc
+++ b/src/chromeos/cert_loader_unittest.cc
@@ -9,9 +9,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 #include "crypto/scoped_nss_types.h"
+#include "crypto/scoped_test_nss_chromeos_user.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/nss_cert_database_chromeos.h"
@@ -189,8 +189,6 @@ TEST_F(CertLoaderTest, Basic) {
 
   EXPECT_TRUE(cert_loader_->certificates_loaded());
   EXPECT_FALSE(cert_loader_->CertificatesLoading());
-  EXPECT_EQ(GetDbPrivateSlotId(primary_db_.get()),
-            cert_loader_->TPMTokenSlotID());
 
   // Default CA cert roots should get loaded.
   EXPECT_FALSE(cert_loader_->cert_list().empty());
@@ -305,19 +303,5 @@ TEST_F(CertLoaderTest, UpdatedOnCACertTrustChange) {
   EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
 }
 
-TEST_F(CertLoaderTest, DatabaseWithUnsetSlots) {
-  primary_db_.reset(new net::NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot(),
-                                                     crypto::ScopedPK11Slot()));
-  primary_db_->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy());
-  cert_loader_->StartWithNSSDB(primary_db_.get());
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(1u, GetAndResetCertificatesLoadedEventsCount());
-
-  EXPECT_TRUE(cert_loader_->certificates_loaded());
-  EXPECT_EQ(-1, cert_loader_->TPMTokenSlotID());
-  EXPECT_FALSE(cert_loader_->IsHardwareBacked());
-}
-
 }  // namespace
 }  // namespace chromeos