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

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

Index: third_party/protobuf/python/google/protobuf/internal/message_cpp_test.py
diff --git a/third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py b/third_party/protobuf/python/google/protobuf/internal/message_cpp_test.py
similarity index 82%
rename from third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
rename to third_party/protobuf/python/google/protobuf/internal/message_cpp_test.py
index 5121dd0ec58ff275d215edafc2e84c1c7b800e0a..0d84b3207bdd0a5f5b7202e9ad67d6cfcf55e0d3 100644
--- a/third_party/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
+++ b/third_party/protobuf/python/google/protobuf/internal/message_cpp_test.py
@@ -1,6 +1,8 @@
+#! /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
@@ -28,6 +30,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""Sample module importing a nested proto from itself."""
+"""Tests for google.protobuf.internal.message_cpp."""
+
+__author__ = 'shahms@google.com (Shahms King)'
+
+import os
+os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
+
+import unittest
+from google.protobuf.internal.message_test import *
+
 
-from google.protobuf.internal.import_test_package import outer_pb2 as myproto
+if __name__ == '__main__':
+  unittest.main()