Linux: change protobuf default option to allow building

with unpatched system protobuf.

This is a preparation for landing https://codereview.chromium.org/11231046/
and a solution chosen because our custom protobuf changes will not
be accepted upstream.

Setting defaults to optimize for lite runtime and retain unknown fields
makes it possible to use the same .proto files with system protobuf.

BUG=157155
TEST=none

Review URL: https://codereview.chromium.org/11228038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166534 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 0 insertions, 72 deletions

diff --git a/sync/protocol/app_notification_specifics.proto b/sync/protocol/app_notification_specifics.proto
index 58436c7..76a9ed0 100644
--- a/sync/protocol/app_notification_specifics.proto
+++ b/sync/protocol/app_notification_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of an app notification.
diff --git a/sync/protocol/app_setting_specifics.proto b/sync/protocol/app_setting_specifics.proto
index d936c66..03877ce 100644
--- a/sync/protocol/app_setting_specifics.proto
+++ b/sync/protocol/app_setting_specifics.proto
@@ -11,9 +11,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "extension_setting_specifics.proto";
diff --git a/sync/protocol/app_specifics.proto b/sync/protocol/app_specifics.proto
index a7f09ec..d4b31c2 100644
--- a/sync/protocol/app_specifics.proto
+++ b/sync/protocol/app_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "extension_specifics.proto";
diff --git a/sync/protocol/autofill_specifics.proto b/sync/protocol/autofill_specifics.proto
index ac7bc51..373beef 100644
--- a/sync/protocol/autofill_specifics.proto
+++ b/sync/protocol/autofill_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of autofill sync objects.
diff --git a/sync/protocol/bookmark_specifics.proto b/sync/protocol/bookmark_specifics.proto
index 31721ab..ac26e2b 100644
--- a/sync/protocol/bookmark_specifics.proto
+++ b/sync/protocol/bookmark_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of bookmark sync objects.
diff --git a/sync/protocol/client_commands.proto b/sync/protocol/client_commands.proto
index e574255..845a865 100644
--- a/sync/protocol/client_commands.proto
+++ b/sync/protocol/client_commands.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 message ClientCommand {
diff --git a/sync/protocol/client_debug_info.proto b/sync/protocol/client_debug_info.proto
index 7be62d5..c9eea04 100644
--- a/sync/protocol/client_debug_info.proto
+++ b/sync/protocol/client_debug_info.proto
@@ -6,9 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "get_updates_caller_info.proto";
diff --git a/sync/protocol/device_info_specifics.proto b/sync/protocol/device_info_specifics.proto
index 67eb469..349b8f6 100644
--- a/sync/protocol/device_info_specifics.proto
+++ b/sync/protocol/device_info_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "sync_enums.proto";
diff --git a/sync/protocol/encryption.proto b/sync/protocol/encryption.proto
index 202ec33..471cf9c 100644
--- a/sync/protocol/encryption.proto
+++ b/sync/protocol/encryption.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Encrypted sync data consists of two parts: a key name and a blob. Key name is
diff --git a/sync/protocol/experiments_specifics.proto b/sync/protocol/experiments_specifics.proto
index adb40a9..3c38ac5 100644
--- a/sync/protocol/experiments_specifics.proto
+++ b/sync/protocol/experiments_specifics.proto
@@ -6,9 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // A flag to enable support for keystore encryption.
diff --git a/sync/protocol/extension_setting_specifics.proto b/sync/protocol/extension_setting_specifics.proto
index 62947c5..75b914f 100644
--- a/sync/protocol/extension_setting_specifics.proto
+++ b/sync/protocol/extension_setting_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of extension setting sync objects.
diff --git a/sync/protocol/extension_specifics.proto b/sync/protocol/extension_specifics.proto
index e3e1dfb..d947cc6 100644
--- a/sync/protocol/extension_specifics.proto
+++ b/sync/protocol/extension_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of extension sync objects.
diff --git a/sync/protocol/get_updates_caller_info.proto b/sync/protocol/get_updates_caller_info.proto
index 86fe9c8..5cecbf5 100644
--- a/sync/protocol/get_updates_caller_info.proto
+++ b/sync/protocol/get_updates_caller_info.proto
@@ -4,9 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 message GetUpdatesCallerInfo {
diff --git a/sync/protocol/history_delete_directive_specifics.proto b/sync/protocol/history_delete_directive_specifics.proto
index 557de8d..5d2b59a 100644
--- a/sync/protocol/history_delete_directive_specifics.proto
+++ b/sync/protocol/history_delete_directive_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // All timestamps below are from Sane Time (
diff --git a/sync/protocol/nigori_specifics.proto b/sync/protocol/nigori_specifics.proto
index c904783..cf9b9d0 100644
--- a/sync/protocol/nigori_specifics.proto
+++ b/sync/protocol/nigori_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "encryption.proto";
diff --git a/sync/protocol/password_specifics.proto b/sync/protocol/password_specifics.proto
index 769914433..064f3e9 100644
--- a/sync/protocol/password_specifics.proto
+++ b/sync/protocol/password_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "encryption.proto";
diff --git a/sync/protocol/preference_specifics.proto b/sync/protocol/preference_specifics.proto
index 4827c5d..433df4d 100644
--- a/sync/protocol/preference_specifics.proto
+++ b/sync/protocol/preference_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of preference sync objects.
diff --git a/sync/protocol/search_engine_specifics.proto b/sync/protocol/search_engine_specifics.proto
index 200255b..7aaf50e 100644
--- a/sync/protocol/search_engine_specifics.proto
+++ b/sync/protocol/search_engine_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of custom search engine sync objects.
diff --git a/sync/protocol/session_specifics.proto b/sync/protocol/session_specifics.proto
index 41a6d33..086026b 100644
--- a/sync/protocol/session_specifics.proto
+++ b/sync/protocol/session_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "sync_enums.proto";
diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto
index 2b564e5..9f8493f 100644
--- a/sync/protocol/sync.proto
+++ b/sync/protocol/sync.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "app_notification_specifics.proto";
diff --git a/sync/protocol/sync_enums.proto b/sync/protocol/sync_enums.proto
index 30921a5..01d117bf 100644
--- a/sync/protocol/sync_enums.proto
+++ b/sync/protocol/sync_enums.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 message SyncEnums {
diff --git a/sync/protocol/test.proto b/sync/protocol/test.proto
index 7453cee..b95dc2b 100644
--- a/sync/protocol/test.proto
+++ b/sync/protocol/test.proto
@@ -6,9 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 message UnknownFieldsTestA {
diff --git a/sync/protocol/theme_specifics.proto b/sync/protocol/theme_specifics.proto
index f8318e8..1569d176 100644
--- a/sync/protocol/theme_specifics.proto
+++ b/sync/protocol/theme_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of theme sync objects.
diff --git a/sync/protocol/typed_url_specifics.proto b/sync/protocol/typed_url_specifics.proto
index 1f8a4b8..f1fc566 100644
--- a/sync/protocol/typed_url_specifics.proto
+++ b/sync/protocol/typed_url_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of typed_url sync objects - fields correspond to similarly named