1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
index e1dd697a..0c4af61b 100644
--- a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
+++ b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
@@ -60,7 +60,7 @@ class BaseDefaultValueObjectWriterTest
   TypeInfoTestHelper helper_;
   MockObjectWriter mock_;
   ExpectingObjectWriter expects_;
-  google::protobuf::scoped_ptr<DefaultValueObjectWriter> testing_;
+  std::unique_ptr<DefaultValueObjectWriter> testing_;
 };
 
 // Tests to cover some basic DefaultValueObjectWriter use cases. More tests are
@@ -156,7 +156,7 @@ class DefaultValueObjectWriterSuppressListTest
       : BaseDefaultValueObjectWriterTest(DefaultValueTest::descriptor()) {
     testing_->set_suppress_empty_list(true);
   }
-  ~DefaultValueObjectWriterSuppressListTest() {}
+  ~DefaultValueObjectWriterSuppressListTest() override {}
 };
 
 INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,