Fix incorrect namespace usage.

Change: 117159270

Author: kirilg

tensorflow_serving/test_util/test_util.cc

@@ -30,7 +30,7 @@ string TestSrcDirPath(const string& relative_path) {
 
 ProtoStringMatcher::ProtoStringMatcher(const string& expected)
     : expected_(expected) {}
-ProtoStringMatcher::ProtoStringMatcher(const proto2::Message& expected)
+ProtoStringMatcher::ProtoStringMatcher(const google::protobuf::Message& expected)
     : expected_(expected.DebugString()) {}
 
 }  // namespace test_util

tensorflow_serving/test_util/test_util.h

@@ -45,7 +45,7 @@ string TestSrcDirPath(const string& relative_path);
 class ProtoStringMatcher {
  public:
   explicit ProtoStringMatcher(const string& expected);
-  explicit ProtoStringMatcher(const proto2::Message& expected);
+  explicit ProtoStringMatcher(const google::protobuf::Message& expected);
 
   template <typename Message>
   bool MatchAndExplain(const Message& p,
@@ -68,7 +68,7 @@ inline ::testing::PolymorphicMatcher<ProtoStringMatcher> EqualsProto(
 
 // Polymorphic matcher to compare any two protos.
 inline ::testing::PolymorphicMatcher<ProtoStringMatcher> EqualsProto(
-    const proto2::Message& x) {
+    const google::protobuf::Message& x) {
   return ::testing::MakePolymorphicMatcher(ProtoStringMatcher(x));
 }