Use relative path for libxml and protobuf

This is to remove dependency on Chromium directory layouts, to make it
easier for integration.

Change-Id: Idcdf31a517e50a9a689794a665b3e5e7c05e6c1f

media/event/vod_media_info_dump_muxer_listener.cc

@@ -6,13 +6,14 @@
 
 #include "media/event/vod_media_info_dump_muxer_listener.h"
 
+#include <google/protobuf/text_format.h>
+
 #include "base/logging.h"
 #include "media/base/muxer_options.h"
 #include "media/base/stream_info.h"
 #include "media/event/muxer_listener_internal.h"
 #include "media/file/file.h"
 #include "mpd/base/media_info.pb.h"
-#include "third_party/protobuf/src/google/protobuf/text_format.h"
 
 namespace media {
 namespace event {

media/event/vod_media_info_dump_muxer_listener_unittest.cc

@@ -4,6 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
 
 #include <vector>
@@ -16,7 +17,6 @@
 #include "media/base/muxer_options.h"
 #include "media/base/video_stream_info.h"
 #include "mpd/base/media_info.pb.h"
-#include "third_party/protobuf/src/google/protobuf/text_format.h"
 
 using dash_packager::MediaInfo;
 

mpd/base/mpd_builder.cc

@@ -6,6 +6,9 @@
 
 #include "mpd/base/mpd_builder.h"
 
+#include <libxml/tree.h>
+#include <libxml/xmlstring.h>
+
 #include <cmath>
 #include <list>
 #include <string>
@@ -19,8 +22,6 @@
 #include "mpd/base/content_protection_element.h"
 #include "mpd/base/mpd_utils.h"
 #include "mpd/base/xml/xml_node.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
-#include "third_party/libxml/src/include/libxml/xmlstring.h"
 
 namespace dash_packager {
 

mpd/base/mpd_builder_unittest.cc

@@ -6,6 +6,7 @@
 
 #include <gtest/gtest.h>
 #include <inttypes.h>
+#include <libxml/xmlstring.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -17,7 +18,6 @@
 #include "mpd/base/mpd_utils.h"
 #include "mpd/test/mpd_builder_test_helper.h"
 #include "mpd/test/xml_compare.h"
-#include "third_party/libxml/src/include/libxml/xmlstring.h"
 
 namespace dash_packager {
 

mpd/base/mpd_utils.cc

@@ -6,12 +6,13 @@
 
 #include "mpd/base/mpd_utils.h"
 
+#include <libxml/tree.h>
+
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "mpd/base/content_protection_element.h"
 #include "mpd/base/media_info.pb.h"
 #include "mpd/base/xml/scoped_xml_ptr.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
 
 namespace {
 

mpd/base/mpd_utils.h

@@ -9,10 +9,11 @@
 #ifndef MPD_BASE_MPD_UTILS_H_
 #define MPD_BASE_MPD_UTILS_H_
 
+#include <libxml/tree.h>
+
 #include <string>
 
 #include "base/basictypes.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
 
 namespace dash_packager {
 

mpd/base/xml/scoped_xml_ptr.h

@@ -10,9 +10,10 @@
 #ifndef MPD_BASE_XML_SCOPED_XML_PTR_H_
 #define MPD_BASE_XML_SCOPED_XML_PTR_H_
 
+#include <libxml/tree.h>
+#include <libxml/xmlschemas.h>
+
 #include "base/memory/scoped_ptr.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
-#include "third_party/libxml/src/include/libxml/xmlschemas.h"
 
 namespace dash_packager {
 namespace xml {

mpd/base/xml/xml_node.h

@@ -10,13 +10,14 @@
 #ifndef MPD_BASE_XML_XML_NODE_H_
 #define MPD_BASE_XML_XML_NODE_H_
 
+#include <libxml/tree.h>
+
 #include <list>
 
 #include "base/basictypes.h"
 #include "mpd/base/content_protection_element.h"
 #include "mpd/base/media_info.pb.h"
 #include "mpd/base/xml/scoped_xml_ptr.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
 
 namespace dash_packager {
 

mpd/base/xml/xml_node_unittest.cc

@@ -5,6 +5,7 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #include <gtest/gtest.h>
+#include <libxml/tree.h>
 
 #include <list>
 
@@ -13,7 +14,6 @@
 #include "mpd/base/mpd_builder.h"
 #include "mpd/base/xml/xml_node.h"
 #include "mpd/test/xml_compare.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
 
 namespace dash_packager {
 namespace xml {

mpd/test/mpd_builder_test_helper.cc

@@ -6,6 +6,7 @@
 
 #include "mpd/test/mpd_builder_test_helper.h"
 
+#include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
 
 #include "base/file_util.h"
@@ -14,7 +15,6 @@
 #include "mpd/base/mpd_builder.h"
 #include "mpd/base/xml/scoped_xml_ptr.h"
 #include "mpd/test/xml_compare.h"
-#include "third_party/protobuf/src/google/protobuf/text_format.h"
 
 namespace dash_packager {
 

mpd/test/xml_compare.cc

@@ -1,5 +1,7 @@
 #include "mpd/test/xml_compare.h"
 
+#include <libxml/tree.h>
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -7,7 +9,6 @@
 
 #include "base/logging.h"
 #include "mpd/base/xml/scoped_xml_ptr.h"
-#include "third_party/libxml/src/include/libxml/tree.h"
 
 namespace dash_packager {
 

mpd/test/xml_compare.h

@@ -1,9 +1,9 @@
 #ifndef MPD_TEST_XML_COMPARE_H_
 #define MPD_TEST_XML_COMPARE_H_
 
-#include <string>
+#include <libxml/tree.h>
 
-#include "third_party/libxml/src/include/libxml/tree.h"
+#include <string>
 
 namespace dash_packager {
 

mpd/util/mpd_writer.cc

@@ -6,10 +6,11 @@
 
 #include "mpd/util/mpd_writer.h"
 
+#include <google/protobuf/text_format.h>
+
 #include "base/basictypes.h"
 #include "media/file/file.h"
 #include "mpd/base/mpd_builder.h"
-#include "third_party/protobuf/src/google/protobuf/text_format.h"
 
 using media::File;