Update //third_party/protobuf to version 3.

third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java

Index: third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
diff --git a/third_party/protobuf/python/google/protobuf/internal/factory_test1.proto b/third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
similarity index 69%
copy from third_party/protobuf/python/google/protobuf/internal/factory_test1.proto
copy to third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
index 9f55e037f6e69ff8e76a3f260eff006af1bcce65..a92ba374a6c1ea4acd5fde2c609cf0cce90c5ac2 100644
--- a/third_party/protobuf/python/google/protobuf/internal/factory_test1.proto
+++ b/third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
@@ -1,6 +1,6 @@
 // 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
@@ -28,28 +28,21 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Author: matthewtoia@google.com (Matt Toia)
+package com.google.protobuf;
 
+/**
+ * A prerun for a test suite that allows running the full protocol buffer
+ * tests in a mode that disables the optimization for not using
+ * {@link RepeatedFieldBuilder} and {@link SingleFieldBuilder} until they are
+ * requested. This allows us to run all the tests through both code paths
+ * and ensures that both code paths produce identical results.
+ *
+ * @author jonp@google.com (Jon Perlow)
+ */
+public class ForceFieldBuildersPreRun implements Runnable {
 
-package google.protobuf.python.internal;
-
-
-enum Factory1Enum {
-  FACTORY_1_VALUE_0 = 0;
-  FACTORY_1_VALUE_1 = 1;
-}
-
-message Factory1Message {
-  optional Factory1Enum factory_1_enum = 1;
-  enum NestedFactory1Enum {
-    NESTED_FACTORY_1_VALUE_0 = 0;
-    NESTED_FACTORY_1_VALUE_1 = 1;
-  }
-  optional NestedFactory1Enum nested_factory_1_enum = 2;
-  message NestedFactory1Message {
-    optional string value = 1;
+  //@Override (Java 1.6 override semantics, but we must support 1.5)
+  public void run() {
+    GeneratedMessage.enableAlwaysUseFieldBuildersForTesting();
   }
-  optional NestedFactory1Message nested_factory_1_message = 3;
-  optional int32 scalar_value = 4;
-  repeated string list_value = 5;
 }