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

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

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component 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 29 matching lines...) Expand all
40 #include <google/protobuf/map.h> 40 #include <google/protobuf/map.h>
41 #include <google/protobuf/arena_test_util.h> 41 #include <google/protobuf/arena_test_util.h>
42 #include <google/protobuf/map_unittest.pb.h> 42 #include <google/protobuf/map_unittest.pb.h>
43 #include <google/protobuf/map_test_util.h> 43 #include <google/protobuf/map_test_util.h>
44 #include <google/protobuf/unittest.pb.h> 44 #include <google/protobuf/unittest.pb.h>
45 #include <google/protobuf/map_field_inl.h> 45 #include <google/protobuf/map_field_inl.h>
46 #include <google/protobuf/message.h> 46 #include <google/protobuf/message.h>
47 #include <google/protobuf/repeated_field.h> 47 #include <google/protobuf/repeated_field.h>
48 #include <google/protobuf/wire_format_lite_inl.h> 48 #include <google/protobuf/wire_format_lite_inl.h>
49 #include <gtest/gtest.h> 49 #include <gtest/gtest.h>
50 namespace google {
50 51
51 namespace google {
52 namespace protobuf { 52 namespace protobuf {
53 53
54 namespace internal { 54 namespace internal {
55 55
56 using unittest::TestAllTypes; 56 using unittest::TestAllTypes;
57 57
58 class MapFieldBaseStub : public MapFieldBase { 58 class MapFieldBaseStub : public MapFieldBase {
59 public: 59 public:
60 typedef void InternalArenaConstructable_; 60 typedef void InternalArenaConstructable_;
61 typedef void DestructorSkippable_; 61 typedef void DestructorSkippable_;
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 Expect(map_field_.get(), REPEATED_DIRTY, 1, 1, false); 485 Expect(map_field_.get(), REPEATED_DIRTY, 1, 1, false);
486 } else { 486 } else {
487 Expect(map_field_.get(), REPEATED_DIRTY, 0, 1, false); 487 Expect(map_field_.get(), REPEATED_DIRTY, 0, 1, false);
488 } 488 }
489 } 489 }
490 490
491 491
492 } // namespace internal 492 } // namespace internal
493 } // namespace protobuf 493 } // namespace protobuf
494 } // namespace google 494 } // namespace google
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698