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

Side by Side Diff: third_party/protobuf/src/google/protobuf/descriptor_database_unittest.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 30 matching lines...) Expand all
41 #endif 41 #endif
42 42
43 #include <google/protobuf/descriptor_database.h> 43 #include <google/protobuf/descriptor_database.h>
44 #include <google/protobuf/descriptor.h> 44 #include <google/protobuf/descriptor.h>
45 #include <google/protobuf/descriptor.pb.h> 45 #include <google/protobuf/descriptor.pb.h>
46 #include <google/protobuf/text_format.h> 46 #include <google/protobuf/text_format.h>
47 #include <google/protobuf/stubs/strutil.h> 47 #include <google/protobuf/stubs/strutil.h>
48 48
49 #include <google/protobuf/stubs/logging.h> 49 #include <google/protobuf/stubs/logging.h>
50 #include <google/protobuf/stubs/common.h> 50 #include <google/protobuf/stubs/common.h>
51 #include <google/protobuf/stubs/scoped_ptr.h>
52 #include <google/protobuf/testing/googletest.h> 51 #include <google/protobuf/testing/googletest.h>
53 #include <gtest/gtest.h> 52 #include <gtest/gtest.h>
54 53
55 namespace google { 54 namespace google {
56 namespace protobuf { 55 namespace protobuf {
57 namespace { 56 namespace {
58 57
59 static void AddToDatabase(SimpleDescriptorDatabase* database, 58 static void AddToDatabase(SimpleDescriptorDatabase* database,
60 const char* file_text) { 59 const char* file_text) {
61 FileDescriptorProto file_proto; 60 FileDescriptorProto file_proto;
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 { 744 {
746 // Can't find extensions for a non-existent message. 745 // Can't find extensions for a non-existent message.
747 vector<int> numbers; 746 vector<int> numbers;
748 EXPECT_FALSE(reverse_merged_.FindAllExtensionNumbers("Blah", &numbers)); 747 EXPECT_FALSE(reverse_merged_.FindAllExtensionNumbers("Blah", &numbers));
749 } 748 }
750 } 749 }
751 750
752 } // anonymous namespace 751 } // anonymous namespace
753 } // namespace protobuf 752 } // namespace protobuf
754 } // namespace google 753 } // namespace google
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698