Replace utils::SharedPtr with std::shared_ptr, remove non-standard usage

4 files changed, 11 insertions, 11 deletions

diff --git a/src/components/hmi_message_handler/mock_hmi_message_handler.h b/src/components/hmi_message_handler/mock_hmi_message_handler.h
index d9060088ff..f4ed601bed 100644
--- a/src/components/hmi_message_handler/mock_hmi_message_handler.h
+++ b/src/components/hmi_message_handler/mock_hmi_message_handler.h
@@ -50,9 +50,9 @@ class MockHMIMessageHandler : public ::hmi_message_handler::HMIMessageHandler {
   MOCK_METHOD1(RemoveHMIMessageAdapter, void(HMIMessageAdapter* adapter));
   MOCK_CONST_METHOD0(get_settings, const HMIMessageHandlerSettings&());
   MOCK_METHOD1(OnMessageReceived,
-               void(utils::SharedPtr<application_manager::Message> message));
+               void(std::shared_ptr<application_manager::Message> message));
   MOCK_METHOD1(OnErrorSending,
-               void(utils::SharedPtr<application_manager::Message> message));
+               void(std::shared_ptr<application_manager::Message> message));
   MOCK_METHOD1(SendMessageToHMI, void(MessageSharedPointer message));
 };
 }  // namespace hmi_message_handler_test
diff --git a/src/components/hmi_message_handler/src/messagebroker_adapter.cc b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
index 53a0d84362..d400cca335 100644
--- a/src/components/hmi_message_handler/src/messagebroker_adapter.cc
+++ b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
@@ -55,7 +55,7 @@ void MessageBrokerAdapter::SendMessageToHMI(
     hmi_message_handler::MessageSharedPointer message) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  if (!message.valid()) {
+  if (message.use_count() == 0) {
     LOG4CXX_ERROR(logger_, "Can`t send not valid message");
     return;
   }
diff --git a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc
index eead7106c6..2ac91ba16d 100644
--- a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc
+++ b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc
@@ -31,8 +31,8 @@
  */
 
 #include "gtest/gtest.h"
-#include "utils/shared_ptr.h"
-#include "utils/make_shared.h"
+
+
 
 #include "hmi_message_handler/hmi_message_handler_impl.h"
 #include "hmi_message_handler/mock_hmi_message_adapter_impl.h"
@@ -45,7 +45,7 @@ namespace hmi_message_handler_test {
 using ::testing::Return;
 using hmi_message_handler::HMIMessageHandlerImpl;
 
-typedef utils::SharedPtr<MockHMIMessageAdapterImpl>
+typedef std::shared_ptr<MockHMIMessageAdapterImpl>
     MockHMIMessageAdapterImplSPtr;
 
 TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) {
@@ -60,7 +60,7 @@ TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) {
   ;
 
   MockHMIMessageAdapterImplSPtr message_adapter_impl =
-      utils::MakeShared<MockHMIMessageAdapterImpl>(message_handler);
+      std::make_shared<MockHMIMessageAdapterImpl>(message_handler);
 
   EXPECT_EQ(message_handler, message_adapter_impl->get_handler());
 
@@ -71,7 +71,7 @@ TEST(HMIMessageAdapterImplTest, Handler_CorrectPointer_CorrectReturnedPointer) {
 TEST(HMIMessageAdapterImplTest, Handler_NULLPointer_CorrectReturnedPointer) {
   HMIMessageHandler* message_handler = NULL;
   MockHMIMessageAdapterImplSPtr message_adapter_impl =
-      utils::MakeShared<MockHMIMessageAdapterImpl>(message_handler);
+      std::make_shared<MockHMIMessageAdapterImpl>(message_handler);
 
   EXPECT_EQ(NULL, message_adapter_impl->get_handler());
 }
diff --git a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc
index fd459ea094..e66f900299 100644
--- a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc
+++ b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc
@@ -86,7 +86,7 @@ class HMIMessageHandlerImplTest : public ::testing::Test {
 
   hmi_message_handler::MessageSharedPointer CreateMessage() {
     // The ServiceType doesn't really matter
-    return new application_manager::Message(
+    return std::make_shared<application_manager::Message>(
         protocol_handler::MessagePriority::FromServiceType(
             protocol_handler::ServiceType::kInvalidServiceType));
   }
@@ -104,7 +104,7 @@ TEST_F(HMIMessageHandlerImplTest,
 TEST_F(HMIMessageHandlerImplTest,
        OnErrorSending_NotEmptyMessage_ExpectOnErrorSendingProceeded) {
   // Arrange
-  utils::SharedPtr<application_manager::Message> message = CreateMessage();
+  std::shared_ptr<application_manager::Message> message = CreateMessage();
 
   EXPECT_CALL(*mock_hmi_message_observer_, OnErrorSending(message));
   // Act
@@ -113,7 +113,7 @@ TEST_F(HMIMessageHandlerImplTest,
 
 TEST_F(HMIMessageHandlerImplTest, OnErrorSending_InvalidObserver_Cancelled) {
   // Arrange
-  utils::SharedPtr<application_manager::Message> message = CreateMessage();
+  std::shared_ptr<application_manager::Message> message = CreateMessage();
 
   hmi_handler_->set_message_observer(NULL);
   EXPECT_CALL(*mock_hmi_message_observer_, OnErrorSending(_)).Times(0);