Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: third_party/protobuf/src/google/protobuf/map_lite_test_util.cc

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/src/google/protobuf/map_lite_test_util.cc
diff --git a/third_party/protobuf/src/google/protobuf/map_lite_test_util.cc b/third_party/protobuf/src/google/protobuf/map_lite_test_util.cc
deleted file mode 100644
index b65b4d63015f9c9a711680e65cba2e52e95235d7..0000000000000000000000000000000000000000
--- a/third_party/protobuf/src/google/protobuf/map_lite_test_util.cc
+++ /dev/null
@@ -1,93 +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/map_lite_test_util.h>
-#include <google/protobuf/map_lite_unittest.pb.h>
-#include <google/protobuf/map_test_util_impl.h>
-
-namespace google {
-namespace protobuf {
-
-void MapLiteTestUtil::SetMapFields(unittest::TestMapLite* message) {
- MapTestUtilImpl::SetMapFields<unittest::MapEnumLite,
- unittest::MAP_ENUM_BAR_LITE,
- unittest::MAP_ENUM_BAZ_LITE>(message);
-}
-
-void MapLiteTestUtil::SetArenaMapFields(unittest::TestArenaMapLite* message) {
- MapTestUtilImpl::SetArenaMapFields<unittest::MapEnumLite,
- unittest::MAP_ENUM_BAR_LITE,
- unittest::MAP_ENUM_BAZ_LITE>(message);
-}
-
-void MapLiteTestUtil::SetMapFieldsInitialized(unittest::TestMapLite* message) {
- MapTestUtilImpl::SetMapFieldsInitialized(message);
-}
-
-void MapLiteTestUtil::ModifyMapFields(unittest::TestMapLite* message) {
- MapTestUtilImpl::ModifyMapFields<unittest::MapEnumLite,
- unittest::MAP_ENUM_FOO_LITE>(message);
-}
-
-void MapLiteTestUtil::ExpectClear(const unittest::TestMapLite& message) {
- MapTestUtilImpl::ExpectClear(message);
-}
-
-void MapLiteTestUtil::ExpectMapFieldsSet(const unittest::TestMapLite& message) {
- MapTestUtilImpl::ExpectMapFieldsSet<unittest::MapEnumLite,
- unittest::MAP_ENUM_BAR_LITE,
- unittest::MAP_ENUM_BAZ_LITE>(message);
-}
-
-void MapLiteTestUtil::ExpectArenaMapFieldsSet(
- const unittest::TestArenaMapLite& message) {
- MapTestUtilImpl::ExpectArenaMapFieldsSet<unittest::MapEnumLite,
- unittest::MAP_ENUM_BAR_LITE,
- unittest::MAP_ENUM_BAZ_LITE>(
- message);
-}
-
-void MapLiteTestUtil::ExpectMapFieldsSetInitialized(
- const unittest::TestMapLite& message) {
- MapTestUtilImpl::ExpectMapFieldsSetInitialized<unittest::MapEnumLite,
- unittest::MAP_ENUM_FOO_LITE>(
- message);
-}
-
-void MapLiteTestUtil::ExpectMapFieldsModified(
- const unittest::TestMapLite& message) {
- MapTestUtilImpl::ExpectMapFieldsModified<unittest::MapEnumLite,
- unittest::MAP_ENUM_BAR_LITE,
- unittest::MAP_ENUM_FOO_LITE>(
- message);
-}
-
-} // namespace protobuf
-} // namespace google

Powered by Google App Engine
This is Rietveld 408576698