[ObjC] Remove options not needed since the protos are specific to ObjC tests.

objectivec/Tests/any_test.proto

@@ -34,8 +34,6 @@ package objc.protobuf.tests;
 
 import "google/protobuf/any.proto";
 
-option java_outer_classname = "TestAnyProto";
-
 message TestAny {
   int32 int32_value = 1;
   google.protobuf.Any any_value = 2;

objectivec/Tests/map_proto2_unittest.proto

@@ -29,7 +29,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 syntax = "proto2";
-option cc_enable_arenas = true;
 
 import "unittest_import.proto";
 

objectivec/Tests/map_unittest.proto

@@ -30,8 +30,6 @@
 
 syntax = "proto3";
 
-option cc_enable_arenas = true;
-
 import "unittest.proto";
 
 // We don't put this in a package within proto2 because we need to make sure

objectivec/Tests/unittest.proto

@@ -38,13 +38,6 @@
 
 syntax = "proto2";
 
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;     // auto-added
-option java_generic_services = true;   // auto-added
-option py_generic_services = true;     // auto-added
-option cc_enable_arenas = true;
-
 import "unittest_import.proto";
 
 // We don't put this in a package within proto2 because we need to make sure
@@ -52,13 +45,6 @@ import "unittest_import.proto";
 // In test_util.h we do "using namespace unittest = objc.protobuf.tests".
 package objc.protobuf.tests;
 
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestProto";
-
 // This proto includes every type of field in both singular and repeated
 // forms.
 message TestAllTypes {

objectivec/Tests/unittest_import.proto

@@ -36,21 +36,8 @@
 
 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.
-// In test_util.h we do
-// "using namespace unittest_import = objc.protobuf.tests.import".
 package objc.protobuf.tests.import;
 
-option optimize_for = SPEED;
-option cc_enable_arenas = true;
-
-// Exercise 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
-// one.
-
 // Test public import
 import public "unittest_import_public.proto";
 

objectivec/Tests/unittest_import_public.proto

@@ -34,8 +34,6 @@ syntax = "proto2";
 
 package objc.protobuf.tests.import;
 
-option java_package = "com.google.protobuf.test";
-
 message PublicImportMessage {
   optional int32 e = 1;
 }

objectivec/Tests/unittest_import_public_lite.proto

@@ -36,8 +36,6 @@ package objc.protobuf.tests.import;
 
 option optimize_for = LITE_RUNTIME;
 
-option java_package = "com.google.protobuf";
-
 message PublicImportMessageLite {
   optional int32 e = 1;
 }

objectivec/Tests/unittest_mset.proto

@@ -41,9 +41,6 @@ import "unittest_mset_wire_format.proto";
 
 package objc.protobuf.tests;
 
-option cc_enable_arenas = true;
-option optimize_for = SPEED;
-
 message TestMessageSetContainer {
   optional objc.protobuf.tests.wireformat.TestMessageSet message_set = 1;
 }

objectivec/Tests/unittest_mset_wire_format.proto

@@ -37,10 +37,6 @@
 syntax = "proto2";
 package objc.protobuf.tests.wireformat;
 
-option cc_enable_arenas = true;
-option optimize_for = SPEED;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 // A message with message_set_wire_format.
 message TestMessageSet {
   option message_set_wire_format = true;

objectivec/Tests/unittest_preserve_unknown_enum.proto

@@ -33,8 +33,6 @@ syntax = "proto3";
 package objc.protobuf.tests.proto3_preserve_unknown_enum;
 option objc_class_prefix = "UnknownEnums";
 
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
 enum MyEnum {
   FOO = 0;
   BAR = 1;