Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc

Index: third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
diff --git a/third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc b/third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
deleted file mode 100644
index 593c7105d04c28b5b708c77b8e41391912c5203b..0000000000000000000000000000000000000000
--- a/third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/default_value_objectwriter.h>
-#include <google/protobuf/util/internal/expecting_objectwriter.h>
-#include <google/protobuf/util/internal/testdata/default_value_test.pb.h>
-#include <google/protobuf/util/internal/type_info_test_helper.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-namespace testing {
-
-using google::protobuf::testing::DefaultValueTest;
-
-// Tests to cover some basic DefaultValueObjectWriter use cases. More tests are
-// in the marshalling_test.cc and translator_integration_test.cc.
-class DefaultValueObjectWriterTest
-    : public ::testing::TestWithParam<testing::TypeInfoSource> {
- protected:
-  DefaultValueObjectWriterTest()
-      : helper_(GetParam()), mock_(), expects_(&mock_) {
-    helper_.ResetTypeInfo(DefaultValueTest::descriptor());
-    testing_.reset(helper_.NewDefaultValueWriter(
-        string(kTypeServiceBaseUrl) + "/" +
-            DefaultValueTest::descriptor()->full_name(),
-        &mock_));
-  }
-
-  virtual ~DefaultValueObjectWriterTest() {}
-
-  TypeInfoTestHelper helper_;
-  MockObjectWriter mock_;
-  ExpectingObjectWriter expects_;
-  google::protobuf::scoped_ptr<DefaultValueObjectWriter> testing_;
-};
-
-INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
-                        DefaultValueObjectWriterTest,
-                        ::testing::Values(
-                            testing::USE_TYPE_RESOLVER));
-
-TEST_P(DefaultValueObjectWriterTest, Empty) {
-  // Set expectation
-  expects_.StartObject("")
-      ->RenderDouble("double_value", 0.0)
-      ->RenderFloat("float_value", 0.0)
-      ->RenderInt64("int64_value", 0)
-      ->RenderUint64("uint64_value", 0)
-      ->RenderInt32("int32_value", 0)
-      ->RenderUint32("uint32_value", 0)
-      ->RenderBool("bool_value", false)
-      ->RenderString("string_value", "")
-      ->RenderBytes("bytes_value", "")
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")->EndObject();
-}
-
-TEST_P(DefaultValueObjectWriterTest, NonDefaultDouble) {
-  // Set expectation
-  expects_.StartObject("")
-      ->RenderDouble("double_value", 1.0)
-      ->RenderFloat("float_value", 0.0)
-      ->RenderInt64("int64_value", 0)
-      ->RenderUint64("uint64_value", 0)
-      ->RenderInt32("int32_value", 0)
-      ->RenderUint32("uint32_value", 0)
-      ->RenderBool("bool_value", false)
-      ->RenderString("string_value", "")
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")->RenderDouble("double_value", 1.0)->EndObject();
-}
-
-TEST_P(DefaultValueObjectWriterTest, ShouldRetainUnknownField) {
-  // Set expectation
-  expects_.StartObject("")
-      ->RenderDouble("double_value", 1.0)
-      ->RenderFloat("float_value", 0.0)
-      ->RenderInt64("int64_value", 0)
-      ->RenderUint64("uint64_value", 0)
-      ->RenderInt32("int32_value", 0)
-      ->RenderUint32("uint32_value", 0)
-      ->RenderBool("bool_value", false)
-      ->RenderString("string_value", "")
-      ->RenderString("unknown", "abc")
-      ->StartObject("unknown_object")
-      ->RenderString("unknown", "def")
-      ->EndObject()
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")
-      ->RenderDouble("double_value", 1.0)
-      ->RenderString("unknown", "abc")
-      ->StartObject("unknown_object")
-      ->RenderString("unknown", "def")
-      ->EndObject()
-      ->EndObject();
-}
-
-}  // namespace testing
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google