Linux: fix header includes for system protobuf.

BUG=157155


Review URL: https://chromiumcodereview.appspot.com/11418102

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

6 files changed, 27 insertions, 0 deletions

diff --git a/chrome/browser/history/url_index_private_data.cc b/chrome/browser/history/url_index_private_data.cc
index c44333fa..ca38009 100644
--- a/chrome/browser/history/url_index_private_data.cc
+++ b/chrome/browser/history/url_index_private_data.cc
@@ -28,7 +28,12 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "net/base/net_util.h"
+
+#if defined(USE_SYSTEM_PROTOBUF)
+#include <google/protobuf/repeated_field.h>
+#else
 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
+#endif
 
 using google::protobuf::RepeatedField;
 using google::protobuf::RepeatedPtrField;
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 012698e..4981242 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -43,7 +43,12 @@
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
+
+#if defined(USE_SYSTEM_PROTOBUF)
+#include <google/protobuf/repeated_field.h>
+#else
 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
+#endif
 
 #if defined(OS_ANDROID)
 #include "content/components/navigation_interception/intercept_navigation_delegate.h"
diff --git a/dbus/message.cc b/dbus/message.cc
index af3c1c5..afcd932 100644
--- a/dbus/message.cc
+++ b/dbus/message.cc
@@ -12,7 +12,12 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "dbus/object_path.h"
+
+#if defined(USE_SYSTEM_PROTOBUF)
+#include <google/protobuf/message_lite.h>
+#else
 #include "third_party/protobuf/src/google/protobuf/message_lite.h"
+#endif
 
 namespace {
 
diff --git a/remoting/protocol/message_decoder.h b/remoting/protocol/message_decoder.h
index 8384141..70a1a07 100644
--- a/remoting/protocol/message_decoder.h
+++ b/remoting/protocol/message_decoder.h
@@ -11,7 +11,12 @@
 #include "base/memory/ref_counted.h"
 #include "net/base/io_buffer.h"
 #include "remoting/base/compound_buffer.h"
+
+#if defined(USE_SYSTEM_PROTOBUF)
+#include <google/protobuf/message_lite.h>
+#else
 #include "third_party/protobuf/src/google/protobuf/message_lite.h"
+#endif
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/util.h b/remoting/protocol/util.h
index a40a9aa..ebcd5e2 100644
--- a/remoting/protocol/util.h
+++ b/remoting/protocol/util.h
@@ -9,7 +9,12 @@
 #define REMOTING_PROTOCOL_UTIL_H_
 
 #include "net/base/io_buffer.h"
+
+#if defined(USE_SYSTEM_PROTOBUF)
+#include <google/protobuf/message_lite.h>
+#else
 #include "third_party/protobuf/src/google/protobuf/message_lite.h"
+#endif
 
 namespace remoting {
 namespace protocol {
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index 98b0f68..b679cad 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -446,6 +446,8 @@
               '<!@(pkg-config --cflags protobuf)',
             ],
             'defines': [
+              'USE_SYSTEM_PROTOBUF',
+
               # This macro must be defined to suppress the use
               # of dynamic_cast<>, which requires RTTI.
               'GOOGLE_PROTOBUF_NO_RTTI',