1 files changed, 11 insertions, 15 deletions
diff --git a/src/components/security_manager/test/crypto_manager_impl_test.cc b/src/components/security_manager/test/crypto_manager_impl_test.cc
index 7fef33f1df..b30684e5f6 100644
--- a/src/components/security_manager/test/crypto_manager_impl_test.cc
+++ b/src/components/security_manager/test/crypto_manager_impl_test.cc
@@ -39,6 +39,7 @@
 #include <fstream>
 #include <sstream>
 
+#include "utils/make_shared.h"
 #include "gtest/gtest.h"
 #include "security_manager/crypto_manager_impl.h"
 #include "security_manager/mock_security_manager_settings.h"
@@ -64,10 +65,14 @@ namespace test {
 namespace components {
 namespace crypto_manager_test {
 
+using security_manager::CryptoManagerImpl;
+
 class CryptoManagerTest : public testing::Test {
  protected:
+  typedef NiceMock<security_manager_test::MockCryptoManagerSettings>
+      MockCryptoManagerSettings;
   static void SetUpTestCase() {
-    std::ifstream certificate_file("server/spt_credential.p12.enc");
+    std::ifstream certificate_file("server/spt_credential.pem");
     ASSERT_TRUE(certificate_file.is_open())
         << "Could not open certificate data file";
 
@@ -81,16 +86,9 @@ class CryptoManagerTest : public testing::Test {
   void SetUp() OVERRIDE {
     ASSERT_FALSE(certificate_data_base64_.empty());
     mock_security_manager_settings_ =
-        new NiceMock<security_manager_test::MockCryptoManagerSettings>();
-    utils::SharedPtr<security_manager::CryptoManagerSettings> scrypto =
-        utils::SharedPtr<security_manager::CryptoManagerSettings>::
-            static_pointer_cast<security_manager::CryptoManagerSettings>(
-                mock_security_manager_settings_);
-    crypto_manager_ = new security_manager::CryptoManagerImpl(scrypto);
-  }
-
-  void TearDown() OVERRIDE {
-    delete mock_security_manager_settings_;
+        utils::MakeShared<MockCryptoManagerSettings>();
+    crypto_manager_ =
+        utils::MakeShared<CryptoManagerImpl>(mock_security_manager_settings_);
   }
 
   void InitSecurityManager() {
@@ -117,11 +115,9 @@ class CryptoManagerTest : public testing::Test {
         .WillByDefault(Return(false));
   }
 
-  security_manager::CryptoManager* crypto_manager_;
+  utils::SharedPtr<CryptoManagerImpl> crypto_manager_;
+  utils::SharedPtr<MockCryptoManagerSettings> mock_security_manager_settings_;
   static std::string certificate_data_base64_;
-
-  NiceMock<security_manager_test::MockCryptoManagerSettings>*
-      mock_security_manager_settings_;
 };
 std::string CryptoManagerTest::certificate_data_base64_;