From a767768447c9e7c7898b5b2847e54aa985fc5041 Mon Sep 17 00:00:00 2001
From: Conlain Kelly <conlain.k@gmail.com>
Date: Mon, 18 Jun 2018 13:08:41 -0400
Subject: replace auto_ptr with unique_ptr, refactor device_apps_launcher.cc/.h

---
 src/components/application_manager/test/usage_statistics_test.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/components/application_manager/test/usage_statistics_test.cc')

diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc
index 6efef83052..b07ce310e9 100644
--- a/src/components/application_manager/test/usage_statistics_test.cc
+++ b/src/components/application_manager/test/usage_statistics_test.cc
@@ -78,14 +78,14 @@ class UsageStatisticsTest : public testing::Test {
 
  protected:
   utils::SharedPtr<MockStatisticsManager> mock_statistics_manager_sptr_;
-  std::auto_ptr<application_manager::UsageStatistics>
+  std::unique_ptr<application_manager::UsageStatistics>
       usage_statistics_test_object1_sptr_;
   const std::string language_;
 };
 
 TEST_F(UsageStatisticsTest, RecordHmiStateChanged_CallMethod_ExpectMethodCall) {
   // Arrange
-  std::auto_ptr<MockAppStopwatch> mock_app_stopwatch_object(
+  std::unique_ptr<MockAppStopwatch> mock_app_stopwatch_object(
       new MockAppStopwatch);
 
   // Checks
@@ -93,7 +93,7 @@ TEST_F(UsageStatisticsTest, RecordHmiStateChanged_CallMethod_ExpectMethodCall) {
   EXPECT_CALL(*mock_app_stopwatch_object, Switch(kTestAppStopwatchId));
 
   // Act
-  std::auto_ptr<application_manager::UsageStatistics>
+  std::unique_ptr<application_manager::UsageStatistics>
       usage_statistics_test_object2_sptr_(
           new application_manager::UsageStatistics(
               kAppId,
-- 
cgit v1.2.1


From 5019af50b9a2236dd75e630aae5b82e440be9620 Mon Sep 17 00:00:00 2001
From: Conlain Kelly <conlain.k@gmail.com>
Date: Wed, 18 Jul 2018 11:13:50 -0400
Subject: Replace utils::SharedPtr with std::shared_ptr, remove non-standard
 usage

---
 src/components/application_manager/test/usage_statistics_test.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/components/application_manager/test/usage_statistics_test.cc')

diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc
index b07ce310e9..28e71f6f60 100644
--- a/src/components/application_manager/test/usage_statistics_test.cc
+++ b/src/components/application_manager/test/usage_statistics_test.cc
@@ -36,8 +36,8 @@
 #include "smart_objects/enum_schema_item.h"
 #include "policy/usage_statistics/mock_statistics_manager.h"
 #include "policy/usage_statistics/mock_app_stopwatch.h"
-#include "utils/make_shared.h"
-#include "utils/shared_ptr.h"
+
+
 
 namespace test {
 namespace components {
@@ -70,14 +70,14 @@ class UsageStatisticsTest : public testing::Test {
  public:
   UsageStatisticsTest()
       : mock_statistics_manager_sptr_(
-            utils::MakeShared<MockStatisticsManager>())
+            std::make_shared<MockStatisticsManager>())
       , usage_statistics_test_object1_sptr_(
             new application_manager::UsageStatistics(
                 kAppId, mock_statistics_manager_sptr_))
       , language_(LanguageIdToString(kTestLanguageId)) {}
 
  protected:
-  utils::SharedPtr<MockStatisticsManager> mock_statistics_manager_sptr_;
+  std::shared_ptr<MockStatisticsManager> mock_statistics_manager_sptr_;
   std::unique_ptr<application_manager::UsageStatistics>
       usage_statistics_test_object1_sptr_;
   const std::string language_;
-- 
cgit v1.2.1


From 81fb6ddaf3ba4ecb5e0129401239af75db45d84d Mon Sep 17 00:00:00 2001
From: Conlain Kelly <conlain.k@gmail.com>
Date: Wed, 18 Jul 2018 11:24:11 -0400
Subject: style fix

---
 src/components/application_manager/test/usage_statistics_test.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/components/application_manager/test/usage_statistics_test.cc')

diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc
index 28e71f6f60..8d2ed690b6 100644
--- a/src/components/application_manager/test/usage_statistics_test.cc
+++ b/src/components/application_manager/test/usage_statistics_test.cc
@@ -37,8 +37,6 @@
 #include "policy/usage_statistics/mock_statistics_manager.h"
 #include "policy/usage_statistics/mock_app_stopwatch.h"
 
-
-
 namespace test {
 namespace components {
 namespace usage_statistics_test {
@@ -69,8 +67,7 @@ const std::string kAppId = "SPT";
 class UsageStatisticsTest : public testing::Test {
  public:
   UsageStatisticsTest()
-      : mock_statistics_manager_sptr_(
-            std::make_shared<MockStatisticsManager>())
+      : mock_statistics_manager_sptr_(std::make_shared<MockStatisticsManager>())
       , usage_statistics_test_object1_sptr_(
             new application_manager::UsageStatistics(
                 kAppId, mock_statistics_manager_sptr_))
-- 
cgit v1.2.1