commit 58d4420e2dd8a3cd354fff9db0052881c25369ce
author Rafi Kamal <rafikamal@google.com> Mon Nov 11 17:06:56 2019 -0800
committer Rafi Kamal <rafikamal93@gmail.com> Tue Nov 12 13:38:58 2019 -0800
tree dacfd3d3e9900de7c50eed6604e102ce37070ae5
parent 6fc04c3f0e07857dff1f55b884f957b4c65aea8e

Down Integrate Internal Changes

conformance/conformance_test.h

diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 6a993de..9f4ce37 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -38,15 +38,13 @@
 #ifndef CONFORMANCE_CONFORMANCE_TEST_H
 #define CONFORMANCE_CONFORMANCE_TEST_H
 
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/wire_format_lite.h>
-
 #include <functional>
 #include <string>
 #include <vector>
 
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/wire_format_lite.h>
+#include <google/protobuf/util/type_resolver.h>
 #include "conformance.pb.h"
 
 namespace conformance {
@@ -218,7 +216,7 @@
         const string& test_name, const string& input);
     virtual ~ConformanceRequestSetting() {}
 
-    Message* GetTestMessage() const;
+    std::unique_ptr<Message> NewTestMessage() const;
 
     string GetTestName() const;