Bug 1336855 - Use unique_ptr for client and server models, r=franziskus

--HG-- extra : histedit_source : cb61e0d5ab05f3419b5925757c9b64816540b561
sailfishos-mirror · Feb 5, 2017 · a821ed7 · a821ed7
1 parent d4d4b45
commit a821ed7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/gtests/ssl_gtest/tls_connect.cc b/gtests/ssl_gtest/tls_connect.cc
@@ -181,11 +181,6 @@ void TlsConnectTestBase::SetUp() {
 void TlsConnectTestBase::TearDown() {
   delete client_;
   delete server_;
-  if (client_model_) {
-    ASSERT_NE(server_model_, nullptr);
-    delete client_model_;
-    delete server_model_;
-  }
 
   SSL_ClearSessionCache();
   SSLInt_ClearSessionTicketKey();
@@ -503,8 +498,8 @@ void TlsConnectTestBase::EnsureModelSockets() {
   // Make sure models agents are available.
   if (!client_model_) {
     ASSERT_EQ(server_model_, nullptr);
-    client_model_ = new TlsAgent(TlsAgent::kClient, TlsAgent::CLIENT, mode_);
-    server_model_ = new TlsAgent(TlsAgent::kServerRsa, TlsAgent::SERVER, mode_);
+    client_model_.reset(new TlsAgent(TlsAgent::kClient, TlsAgent::CLIENT, mode_));
+    server_model_.reset(new TlsAgent(TlsAgent::kServerRsa, TlsAgent::SERVER, mode_));
   }
 
   // Initialise agents.

diff --git a/gtests/ssl_gtest/tls_connect.h b/gtests/ssl_gtest/tls_connect.h
@@ -114,8 +114,8 @@ class TlsConnectTestBase : public ::testing::Test {
   Mode mode_;
   TlsAgent* client_;
   TlsAgent* server_;
-  TlsAgent* client_model_;
-  TlsAgent* server_model_;
+  std::unique_ptr<TlsAgent> client_model_;
+  std::unique_ptr<TlsAgent> server_model_;
   uint16_t version_;
   SessionResumptionMode expected_resumption_mode_;
   std::vector<std::vector<uint8_t>> session_ids_;