Update third_party/protobuf to protobuf-v3.0.0-beta-3

third_party/protobuf/conformance/conformance_ruby.rb

 #!/usr/bin/env ruby
 #
 # 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:
 #
@@ skipping 33 matching lines @@
     when :protobuf_payload
       begin
         test_message =
           Conformance::TestAllTypes.decode(request.protobuf_payload)
       rescue Google::Protobuf::ParseError => err
         response.parse_error = err.message.encode('utf-8')
         return response
       end
 
     when :json_payload
-      test_message = Conformance::TestAllTypes.decode_json(request.json_payload)
+      begin
+        test_message = Conformance::TestAllTypes.decode_json(request.json_payload)
+      rescue Google::Protobuf::ParseError => err
+        response.parse_error = err.message.encode('utf-8')
+        return response
+      end
 
     when nil
       fail "Request didn't have payload"
     end
 
     case request.requested_output_format
     when :UNSPECIFIED
       fail 'Unspecified output format'
 
     when :PROTOBUF
       response.protobuf_payload = test_message.to_proto
 
     when :JSON
       response.json_payload = test_message.to_json
+
+    when nil
+      fail "Request didn't have requested output format"
     end
   rescue StandardError => err
     response.runtime_error = err.message.encode('utf-8')
   end
 
   response
 end
 
 # Returns true if the test ran successfully, false on legitimate EOF.
 # If EOF is encountered in an unexpected place, raises IOError.
@@ skipping 10 matching lines @@
   request = Conformance::ConformanceRequest.decode(serialized_request)
 
   response = do_test(request)
 
   serialized_response = Conformance::ConformanceResponse.encode(response)
   STDOUT.write([serialized_response.length].pack('V'))
   STDOUT.write(serialized_response)
   STDOUT.flush
 
   if $verbose
-    STDERR.puts("conformance-cpp: request={request.to_json}, " \
-                                 "response={response.to_json}\n")
+    STDERR.puts("conformance_ruby: request=#{request.to_json}, " \
+                                 "response=#{response.to_json}\n")
   end
 
   $test_count += 1
 
   true
 end
 
 loop do
   unless do_test_io
-    STDERR.puts('conformance-cpp: received EOF from test runner ' \
+    STDERR.puts('conformance_ruby: received EOF from test runner ' \
                 "after #{$test_count} tests, exiting")
     break
   end
 end