third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/README.chromium

Index: third_party/protobuf/README.chromium
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
index 8838fbc2715f88ba266247fb32e58147b04ad0a0..8b7497af06a291bd937631be11a3c7df5809ac7a 100644
--- a/third_party/protobuf/README.chromium
+++ b/third_party/protobuf/README.chromium
@@ -3,14 +3,13 @@ Short Name: protobuf
 URL: https://github.com/google/protobuf
 License: BSD
 License File: LICENSE
-Version: 3.0.0-beta-3
-Revision: 3470b6895aa659b7559ed678e029a5338e535f14
+Version: 3.1.0
+Revision: b7632464b4efd2f8a8285bd4bfd0fa5157fdeb2d
 Security Critical: yes
 
 Steps used to create the current version:
 1. Pull the release from https://github.com/google/protobuf/releases
-2. Add build files (BUILD.gn, proto_library.gni, protobuf.gyp,
-   protobuf_lite.gypi, protobuf_nacl.gyp).
+2. Add build files (BUILD.gn, proto_library.gni).
 
    Be sure to update the list of source files, as additional .cc files and
    headers might have been added -- you need to find the transitive closure of
@@ -25,7 +24,8 @@ Steps used to create the current version:
    $ for patch in patches/*; do patch -s -p1 < $patch; done
 
    For future releases, it will be worth looking into which patches still need
-   to be applied.
+   to be applied. In case of conflict, update those patches accordingly and save
+   them back in place (i.e. in patches directory).
 5. Generate descriptor_pb2.py using something like the following steps. Make
    sure you've regenerated your buildfiles and will build protoc from the
    newly-modified sources above.
@@ -55,24 +55,20 @@ Description of the patches:
   protobuf symbols in Linux .so libraries, so that protobuf can be built as a
   component (see http://crrev.com/179806).
 
-- 0005-fix-include-js-generator.protobuf
-
-  During merge with internal branch, the <> in one of the #includes were
-  accidentally replaced with "", which results in a failure in checkdeps.
-
-  Fixed in https://github.com/google/protobuf/pull/1547.
-
 - 0007-uninline_googleonce.patch
-- 0008-uninline_get_empty_string.patch
+- 0008-uninline_getemptystring_and_getemptystringalreadyinited.patch
 - 0009-uninline-arenastring.patch
 - 0010-uninline-generated-code.patch
 
   These patches uninline some functions, resulting in a significant reduction
   (somewhere between 500 KB and 1 MB) of binary size.
 
-- 0011-libprotobuf_export.patch
+- 0011-uninline_internal_default_instance.patch
 
-  During merge with internal branch, the dll export attribute was accidentally
-  removed in C++11 mode.
+  This patch is needed to fix Chromium component build, and thus avoid link
+  errors looking like this:
 
-  Fixed in https://github.com/google/protobuf/pull/1549
+    error: undefined reference to 'cc::proto::Vector2dF_default_instance_'
+    error: undefined reference to 'cc::proto::SkPictureID_default_instance_'
+    error: undefined reference to 'cc::proto::LayerTree_default_instance_'
+    [...]