Update //third_party/protobuf to version 3.

third_party/protobuf/src/google/protobuf/unknown_field_set_unittest.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// 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
@@ skipping 22 matching lines @@
 // tests handling of unknown fields throughout the system.
 
 #include <google/protobuf/unknown_field_set.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/wire_format.h>
 #include <google/protobuf/unittest.pb.h>
 #include <google/protobuf/test_util.h>
 
+#include <google/protobuf/stubs/callback.h>
 #include <google/protobuf/stubs/common.h>
+#include <google/protobuf/stubs/logging.h>
+#include <google/protobuf/stubs/mutex.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 #include <google/protobuf/stubs/stl_util.h>
 
 namespace google {
 namespace protobuf {
 
 using internal::WireFormat;
 
 class UnknownFieldSetTest : public testing::Test {
@@ skipping 54 matching lines @@
   // All fields of TestAllTypes should be present, in numeric order (because
   // that's the order we parsed them in).  Fields that are not valid field
   // numbers of TestAllTypes should NOT be present.
 
   int pos = 0;
 
   for (int i = 0; i < 1000; i++) {
     const FieldDescriptor* field = descriptor_->FindFieldByNumber(i);
     if (field != NULL) {
       ASSERT_LT(pos, unknown_fields_->field_count());
-      EXPECT_EQ(i, unknown_fields_->field(pos++).number());
+      // Do not check oneof field if it is not set.
+      if (field->containing_oneof() == NULL) {
+        EXPECT_EQ(i, unknown_fields_->field(pos++).number());
+      } else if (i == unknown_fields_->field(pos).number()) {
+        pos++;
+      }
       if (field->is_repeated()) {
         // Should have a second instance.
         ASSERT_LT(pos, unknown_fields_->field_count());
         EXPECT_EQ(i, unknown_fields_->field(pos++).number());
       }
     }
   }
   EXPECT_EQ(unknown_fields_->field_count(), pos);
 }
 
@@ skipping 338 matching lines @@
     EXPECT_EQ(repeated_field->number(), unknown_fields.field(1).number());
     ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(1).type());
     EXPECT_EQ(4, unknown_fields.field(1).varint());
 
     EXPECT_EQ(repeated_field->number(), unknown_fields.field(2).number());
     ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(2).type());
     EXPECT_EQ(6, unknown_fields.field(2).varint());
   }
 }
 
+TEST_F(UnknownFieldSetTest, SpaceUsedExcludingSelf) {
+  UnknownFieldSet empty;
+  empty.AddVarint(1, 0);
+  EXPECT_EQ(sizeof(vector<UnknownField>) + sizeof(UnknownField),
+            empty.SpaceUsedExcludingSelf());
+}
+
 TEST_F(UnknownFieldSetTest, SpaceUsed) {
   unittest::TestEmptyMessage empty_message;
 
   // Make sure an unknown field set has zero space used until a field is
   // actually added.
   int base_size = empty_message.SpaceUsed();
   UnknownFieldSet* unknown_fields = empty_message.mutable_unknown_fields();
   EXPECT_EQ(base_size, empty_message.SpaceUsed());
 
   // Make sure each thing we add to the set increases the SpaceUsed().
@@ skipping 95 matching lines @@
   static const int kFieldNumberToDelete5 = 6;
   static const int kExpectedFieldNumbers5[] = {1, 2, 3, 4, 5};
   CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers5), kFieldNumberToDelete5,
                       MAKE_VECTOR(kExpectedFieldNumbers5));
 }
 #undef MAKE_VECTOR
 }  // namespace
 
 }  // namespace protobuf
 }  // namespace google