Update protobuf to r428, part 1.

This has been done by:
 - patching third_party/protobuf with the upstream diff for r423:426 and r428 (427 has already been cherrypicked)
 - manually applying the rejected hunks in the following files:
      src/google/protobuf/wire_format.cc
      src/google/protobuf/wire_format_lite.h
      src/google/protobuf/unknown_field_set.cc
      src/google/protobuf/descriptor.pb.h
      src/google/protobuf/extension_set.cc
      src/google/protobuf/wire_format_lite.cc
      src/google/protobuf/descriptor.pb.cc
      src/google/protobuf/wire_format.h
      src/google/protobuf/compiler/plugin.pb.h
      src/google/protobuf/compiler/cpp/cpp_helpers.h
      src/google/protobuf/compiler/cpp/cpp_file.cc
      vsprojects/lite-test.vcproj.rej
      vsprojects/libprotobuf-lite.vcproj.rej
      vsprojects/libprotobuf.vcproj.rej
      vsprojects/tests.vcproj.rej
      vsprojects/extract_includes.bat.rej
 - adding the new cc/h files to protobuf.gyp and disabling MSVC warning C4291
 - rebuilding descriptor.pb.{cc,h} using the upstream protoc r425
 - fixing compilation (replaced WireFormat with WireFormatLite where applicable)
 - cherry-picking the upstream r505
 - applying patch from https://code.google.com/p/protobuf/issues/detail?id=539

To reduce the changelist size, some of the test files were excluded.
They will be committed separately: https://codereview.chromium.org/21231003

BUG=259808
TBR=agl@chromium.org, pliard@google.com

Review URL: https://codereview.chromium.org/21208003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216961 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 0 deletions

diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index df0f6e5..44bcdd6 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -22,6 +22,7 @@
               4244,  # implicit conversion, possible loss of data
               4355,  # 'this' used in base member initializer list
               4267,  # size_t to int truncation
+              4291,  # no matching operator delete for a placement new
             ],
             'defines!': [
               'WIN32_LEAN_AND_MEAN',  # Protobuf defines this itself.
@@ -161,6 +162,7 @@
             'src/google/protobuf/descriptor.pb.h',
             'src/google/protobuf/descriptor_database.h',
             'src/google/protobuf/dynamic_message.h',
+            'src/google/protobuf/generated_enum_reflection.h',
             'src/google/protobuf/generated_message_reflection.h',
             'src/google/protobuf/message.h',
             'src/google/protobuf/reflection_ops.h',
@@ -174,17 +176,27 @@
             'src/google/protobuf/compiler/code_generator.h',
             'src/google/protobuf/compiler/command_line_interface.h',
             'src/google/protobuf/compiler/importer.h',
+            'src/google/protobuf/compiler/java/java_doc_comment.cc',
+            'src/google/protobuf/compiler/java/java_doc_comment.h',
             'src/google/protobuf/compiler/parser.h',
 
             'src/google/protobuf/stubs/strutil.cc',
             'src/google/protobuf/stubs/strutil.h',
             'src/google/protobuf/stubs/substitute.cc',
             'src/google/protobuf/stubs/substitute.h',
+            'src/google/protobuf/stubs/stl_util.h',
+            'src/google/protobuf/stubs/stringprintf.cc',
+            'src/google/protobuf/stubs/stringprintf.h',
             'src/google/protobuf/stubs/structurally_valid.cc',
+            'src/google/protobuf/stubs/template_util.h',
+            'src/google/protobuf/stubs/type_traits.h',
+
             'src/google/protobuf/descriptor.cc',
             'src/google/protobuf/descriptor.pb.cc',
             'src/google/protobuf/descriptor_database.cc',
             'src/google/protobuf/dynamic_message.cc',
+            'src/google/protobuf/extension_set.cc',
+            'src/google/protobuf/extension_set.h',
             'src/google/protobuf/extension_set_heavy.cc',
             'src/google/protobuf/generated_message_reflection.cc',
             'src/google/protobuf/message.cc',
@@ -314,7 +326,10 @@
               'files': [
                 'python/google/protobuf/__init__.py',
                 'python/google/protobuf/descriptor.py',
+                'python/google/protobuf/descriptor_database.py',
+                'python/google/protobuf/descriptor_pool.py',
                 'python/google/protobuf/message.py',
+                'python/google/protobuf/message_factory.py',
                 'python/google/protobuf/reflection.py',
                 'python/google/protobuf/service.py',
                 'python/google/protobuf/service_reflection.py',
@@ -340,6 +355,7 @@
                 'python/google/protobuf/internal/cpp_message.py',
                 'python/google/protobuf/internal/decoder.py',
                 'python/google/protobuf/internal/encoder.py',
+                'python/google/protobuf/internal/enum_type_wrapper.py',
                 'python/google/protobuf/internal/generator_test.py',
                 'python/google/protobuf/internal/message_listener.py',
                 'python/google/protobuf/internal/python_message.py',