Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/python/google/protobuf/internal/wire_format_test.py

Index: third_party/protobuf/python/google/protobuf/internal/wire_format_test.py
diff --git a/third_party/protobuf/python/google/protobuf/internal/wire_format_test.py b/third_party/protobuf/python/google/protobuf/internal/wire_format_test.py
index 78dc11670fde9f8a2d550f687a25bfe13987c01d..760077860349b56ea57f27507492fc88e42bba87 100755
--- a/third_party/protobuf/python/google/protobuf/internal/wire_format_test.py
+++ b/third_party/protobuf/python/google/protobuf/internal/wire_format_test.py
@@ -1,8 +1,8 @@
-#! /usr/bin/env python
+#! /usr/bin/python
 #
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
+# http://code.google.com/p/protobuf/
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -195,7 +195,7 @@ class WireFormatTest(unittest.TestCase):
     # Test UTF-8 string byte size calculation.
     # 1 byte for tag, 1 byte for length, 8 bytes for content.
     self.assertEqual(10, wire_format.StringByteSize(
-        5, b'\xd0\xa2\xd0\xb5\xd1\x81\xd1\x82'.decode('utf-8')))
+        5, unicode('\xd0\xa2\xd0\xb5\xd1\x81\xd1\x82', 'utf-8')))
 
     class MockMessage(object):
       def __init__(self, byte_size):