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

third_party/protobuf/src/google/protobuf/unittest_import.proto

Index: third_party/protobuf/src/google/protobuf/unittest_import.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import.proto b/third_party/protobuf/src/google/protobuf/unittest_import.proto
index 7e165220334f556556c21b881df20918b6218d9a..c115b11171afaa03d7ee6aeedc7506689cfd7038 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import.proto
+++ b/third_party/protobuf/src/google/protobuf/unittest_import.proto
@@ -1,6 +1,6 @@
 // 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
@@ -34,7 +34,6 @@
 //
 // A proto file which is imported by unittest.proto to test importing.
 
-syntax = "proto2";
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
@@ -43,9 +42,8 @@ syntax = "proto2";
 package protobuf_unittest_import;
 
 option optimize_for = SPEED;
-option cc_enable_arenas = true;
 
-// Exercise the java_package option.
+// Excercise the java_package option.
 option java_package = "com.google.protobuf.test";
 
 // Do not set a java_outer_classname here to verify that Proto2 works without