From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 13 Mar 2018 16:37:29 -0700
Subject: Integrated internal changes from Google

---
 src/google/protobuf/lite_arena_unittest.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/google/protobuf/lite_arena_unittest.cc')

diff --git a/src/google/protobuf/lite_arena_unittest.cc b/src/google/protobuf/lite_arena_unittest.cc
index dadaffb6..3e88314d 100644
--- a/src/google/protobuf/lite_arena_unittest.cc
+++ b/src/google/protobuf/lite_arena_unittest.cc
@@ -30,7 +30,6 @@
 
 #include <google/protobuf/arena_test_util.h>
 #include <google/protobuf/map_lite_test_util.h>
-#include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
 namespace google {
@@ -49,7 +48,7 @@ class LiteArenaTest : public testing::Test {
     google::protobuf::Arena::CreateArray<char>(arena_.get(), 1);
   }
 
-  google::protobuf::scoped_ptr<Arena> arena_;
+  std::unique_ptr<Arena> arena_;
 };
 
 TEST_F(LiteArenaTest, MapNoHeapAllocation) {
-- 
cgit v1.2.3