Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // 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.
@@ skipping 158 matching lines @@
           ((UnknownFieldSetLite) objects[i]).writeTo(output);
           output.writeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP);
           break;
         default:
           throw InvalidProtocolBufferException.invalidWireType();
       }
     }
   }
 
   /**
-   * Serializes the set and writes it to {@code output} using {@code MessageSet} wire format.
-   *
-   * <p>For use by generated code only.
-   */
-  public void writeAsMessageSetTo(CodedOutputStream output) throws IOException {
-    for (int i = 0; i < count; i++) {
-      int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
-      output.writeRawMessageSetExtension(fieldNumber, (ByteString) objects[i]);
-    }
-  }
-  
-  /**
-   * Get the number of bytes required to encode this field, including field
-   * number, using {@code MessageSet} wire format.
-   */
-  public int getSerializedSizeAsMessageSet() {
-    int size = memoizedSerializedSize;
-    if (size != -1) {
-      return size;
-    }
-    
-    size = 0;
-    for (int i = 0; i < count; i++) {
-      int tag = tags[i];
-      int fieldNumber = WireFormat.getTagFieldNumber(tag);
-      size += CodedOutputStream.computeRawMessageSetExtensionSize(
-          fieldNumber, (ByteString) objects[i]);
-    }
-    
-    memoizedSerializedSize = size;
-    
-    return size;
-  }
-
-  /**
    * Get the number of bytes required to encode this set.
    *
    * <p>For use by generated code only.
    */
   public int getSerializedSize() {
     int size = memoizedSerializedSize;
     if (size != -1) {
       return size;
     }
     
@@ skipping 72 matching lines @@
    * @param buffer the buffer to write to
    * @param indent the number of spaces the fields should be indented by
    */
   final void printWithIndent(StringBuilder buffer, int indent) {
     for (int i = 0; i < count; i++) {
       int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
       MessageLiteToString.printField(buffer, indent, String.valueOf(fieldNumber), objects[i]);
     }
   }
 
-  // Package private for unsafe experimental runtime.
-  void storeField(int tag, Object value) {
+  private void storeField(int tag, Object value) {
     ensureCapacity();
     
     tags[count] = tag;
     objects[count] = value;
     count++;
   }
   
   /**
    * Ensures that our arrays are long enough to store more metadata.
    */
@@ skipping 87 matching lines @@
     // Ensures initialization in mergeFieldFrom.
     while (true) {
       final int tag = input.readTag();
       if (tag == 0 || !mergeFieldFrom(tag, input)) {
         break;
       }
     }
     return this;
   }
 }