Revert "Linux: change protobuf default option to allow building"

This reverts commit baefae90f294a981c973bffbdd3eccabfe796b6a.

The change broke Chrome for Android because non-vanilla protobuf-lite
Java files were generated.

Original review:
https://codereview.chromium.org/11228038/

TBR=phajdan.jr
BUG=160256

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

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

20 files changed, 41 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/contacts/contact.proto b/chrome/browser/chromeos/contacts/contact.proto
index 32d0911..2926b43 100644
--- a/chrome/browser/chromeos/contacts/contact.proto
+++ b/chrome/browser/chromeos/contacts/contact.proto
@@ -6,6 +6,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package contacts;
 
 // A contact, roughly based on the GData Contact kind:
diff --git a/chrome/browser/chromeos/drive/drive.proto b/chrome/browser/chromeos/drive/drive.proto
index 336bbb7..dc1ba44 100644
--- a/chrome/browser/chromeos/drive/drive.proto
+++ b/chrome/browser/chromeos/drive/drive.proto
@@ -6,6 +6,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package drive;
 
 // Represents base::PlatformFileInfo.
diff --git a/chrome/browser/feedback/proto/annotations.proto b/chrome/browser/feedback/proto/annotations.proto
index 8a3d1c4f..d14751a 100644
--- a/chrome/browser/feedback/proto/annotations.proto
+++ b/chrome/browser/feedback/proto/annotations.proto
@@ -7,6 +7,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 import "math.proto";
diff --git a/chrome/browser/feedback/proto/chrome.proto b/chrome/browser/feedback/proto/chrome.proto
index 6a0658a..c721b06 100644
--- a/chrome/browser/feedback/proto/chrome.proto
+++ b/chrome/browser/feedback/proto/chrome.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 // Chrome Browser and Chrome OS specific data.
diff --git a/chrome/browser/feedback/proto/common.proto b/chrome/browser/feedback/proto/common.proto
index e5cddf8..5e028eb 100644
--- a/chrome/browser/feedback/proto/common.proto
+++ b/chrome/browser/feedback/proto/common.proto
@@ -7,6 +7,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 // Data present in all kinds of feedbacks, regardless of source (Web, Android,
diff --git a/chrome/browser/feedback/proto/config.proto b/chrome/browser/feedback/proto/config.proto
index 4344168..f178912 100644
--- a/chrome/browser/feedback/proto/config.proto
+++ b/chrome/browser/feedback/proto/config.proto
@@ -7,6 +7,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 // Product for which feedback can be sent: GMail, Writely etc.
diff --git a/chrome/browser/feedback/proto/dom.proto b/chrome/browser/feedback/proto/dom.proto
index c59b1ef..f5d1bc3 100644
--- a/chrome/browser/feedback/proto/dom.proto
+++ b/chrome/browser/feedback/proto/dom.proto
@@ -7,6 +7,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 // Data captured from HTMLDocument DOM object.
diff --git a/chrome/browser/feedback/proto/extension.proto b/chrome/browser/feedback/proto/extension.proto
index 72120d5..7feecc0 100644
--- a/chrome/browser/feedback/proto/extension.proto
+++ b/chrome/browser/feedback/proto/extension.proto
@@ -6,6 +6,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 import "common.proto";
diff --git a/chrome/browser/feedback/proto/math.proto b/chrome/browser/feedback/proto/math.proto
index 37b7321..6d8d5cb 100644
--- a/chrome/browser/feedback/proto/math.proto
+++ b/chrome/browser/feedback/proto/math.proto
@@ -6,6 +6,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package userfeedback;
 
 // 2D Dimensions.
diff --git a/chrome/browser/feedback/proto/web.proto b/chrome/browser/feedback/proto/web.proto
index c631230..024ef29 100644
--- a/chrome/browser/feedback/proto/web.proto
+++ b/chrome/browser/feedback/proto/web.proto
@@ -6,6 +6,8 @@ syntax = "proto2";
 
 package userfeedback;
 
+option optimize_for = LITE_RUNTIME;
+
 // Data present in Web related feedbacks
 
 import "annotations.proto";
diff --git a/chrome/browser/history/in_memory_url_index_cache.proto b/chrome/browser/history/in_memory_url_index_cache.proto
index d357bb5..93e8692 100644
--- a/chrome/browser/history/in_memory_url_index_cache.proto
+++ b/chrome/browser/history/in_memory_url_index_cache.proto
@@ -10,6 +10,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package in_memory_url_index;
 
 message InMemoryURLIndexCacheItem {
diff --git a/chrome/browser/metrics/proto/study.proto b/chrome/browser/metrics/proto/study.proto
index a755311..4f7c6a8 100644
--- a/chrome/browser/metrics/proto/study.proto
+++ b/chrome/browser/metrics/proto/study.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package chrome_variations;
 
 // This defines the Protocol Buffer representation of a Chrome Variations study
diff --git a/chrome/browser/metrics/proto/trials_seed.proto b/chrome/browser/metrics/proto/trials_seed.proto
index 9486255..9e0249a 100644
--- a/chrome/browser/metrics/proto/trials_seed.proto
+++ b/chrome/browser/metrics/proto/trials_seed.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package chrome_variations;
 
 import "study.proto";
diff --git a/chrome/browser/net/cert_logger.proto b/chrome/browser/net/cert_logger.proto
index 7370eca..e09ed2a 100644
--- a/chrome/browser/net/cert_logger.proto
+++ b/chrome/browser/net/cert_logger.proto
@@ -18,6 +18,9 @@ syntax = "proto2";
 
 package chrome_browser_net;
 
+// Chrome requires this.
+option optimize_for = LITE_RUNTIME;
+
 // Protocol types
 message CertLoggerRequest {
   // The hostname being accessed (required as the cert could be valid for
diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto
index cb4ba04..4b3a77a 100644
--- a/chrome/browser/policy/proto/chrome_device_policy.proto
+++ b/chrome/browser/policy/proto/chrome_device_policy.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package enterprise_management;
 
 message DevicePolicyRefreshRateProto {
diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto
index a43c53e..0d0cfb9 100644
--- a/chrome/browser/policy/proto/device_management_backend.proto
+++ b/chrome/browser/policy/proto/device_management_backend.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package enterprise_management;
 
 // Request from device to server to register device.
diff --git a/chrome/browser/policy/proto/device_management_local.proto b/chrome/browser/policy/proto/device_management_local.proto
index ac319c2..122e863 100644
--- a/chrome/browser/policy/proto/device_management_local.proto
+++ b/chrome/browser/policy/proto/device_management_local.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package enterprise_management;
 
 import "device_management_backend.proto";
diff --git a/chrome/browser/policy/proto/old_generic_format.proto b/chrome/browser/policy/proto/old_generic_format.proto
index 4bf28a9..dac2850 100644
--- a/chrome/browser/policy/proto/old_generic_format.proto
+++ b/chrome/browser/policy/proto/old_generic_format.proto
@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package enterprise_management;
 
 // This file keeps the deprecated GenericNamedValue based format for policies
diff --git a/chrome/browser/safe_browsing/report.proto b/chrome/browser/safe_browsing/report.proto
index aab3ac6..5e203a7 100644
--- a/chrome/browser/safe_browsing/report.proto
+++ b/chrome/browser/safe_browsing/report.proto
@@ -16,6 +16,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package safe_browsing;
 
 message ClientMalwareReportRequest {
diff --git a/chrome/browser/sync_file_system/sync_file_system.proto b/chrome/browser/sync_file_system/sync_file_system.proto
index 681ead0..faa91dc 100644
--- a/chrome/browser/sync_file_system/sync_file_system.proto
+++ b/chrome/browser/sync_file_system/sync_file_system.proto
@@ -6,6 +6,8 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+
 package sync_file_system;
 
 message DriveMetadata {