Modify include headers to have "packager" in the path

This is a follow up to previous CL.

Generated using command:
find {media,app,mpd} -type f -exec sed -r -i 's/#include "(.*)"/#include
"packager\/\1"/' {} \;

common.gypi and mpd.gyp are also modified to take the path change into
consideration.

Change-Id: I1fb102b4eb73ae5fde5f4ab303a12cec09b05c33

packager/app/fixed_key_encryption_flags.cc

@@ -6,7 +6,7 @@
 //
 // Defines command line flags for fixed key encryption.
 
-#include "app/fixed_key_encryption_flags.h"
+#include "packager/app/fixed_key_encryption_flags.h"
 
 DEFINE_bool(enable_fixed_key_encryption,
             false,

packager/app/libcrypto_threading.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "app/libcrypto_threading.h"
+#include "packager/app/libcrypto_threading.h"
 
 namespace edash_packager {
 namespace media {

packager/app/libcrypto_threading.h

@@ -7,7 +7,7 @@
 #ifndef APP_LIBCRYPTO_THREADING_H_
 #define APP_LIBCRYPTO_THREADING_H_
 
-#include "base/macros.h"
+#include "packager/base/macros.h"
 
 namespace edash_packager {
 namespace media {

packager/app/libcrypto_threading_posix.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "app/libcrypto_threading.h"
+#include "packager/app/libcrypto_threading.h"
 
 #include <openssl/crypto.h>
 #include <pthread.h>

packager/app/mpd_flags.cc

@@ -6,7 +6,7 @@
 //
 // Defines Mpd flags.
 
-#include "app/mpd_flags.h"
+#include "packager/app/mpd_flags.h"
 
 // TODO(rkuroiwa, kqyang): Remove the 'Exclusive' statements once
 // --output_media_info can work together with --mpd_output.

packager/app/mpd_generator.cc

@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "app/mpd_generator_flags.h"
-#include "base/logging.h"
-#include "base/strings/string_split.h"
-#include "base/strings/stringprintf.h"
-#include "mpd/util/mpd_writer.h"
+#include "packager/app/mpd_generator_flags.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_split.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/mpd/util/mpd_writer.h"
 
 namespace {
 const char kUsage[] =

packager/app/muxer_flags.cc

@@ -6,7 +6,7 @@
 //
 // Defines Muxer flags.
 
-#include "app/muxer_flags.h"
+#include "packager/app/muxer_flags.h"
 
 DEFINE_string(profile,
               "",

packager/app/packager_main.cc

@@ -6,27 +6,27 @@
 
 #include <iostream>
 
-#include "app/fixed_key_encryption_flags.h"
-#include "app/libcrypto_threading.h"
-#include "app/mpd_flags.h"
-#include "app/muxer_flags.h"
-#include "app/packager_util.h"
-#include "app/stream_descriptor.h"
-#include "app/widevine_encryption_flags.h"
-#include "base/logging.h"
-#include "base/stl_util.h"
-#include "base/strings/string_split.h"
-#include "base/strings/stringprintf.h"
-#include "base/threading/simple_thread.h"
-#include "media/base/demuxer.h"
-#include "media/base/key_source.h"
-#include "media/base/muxer_options.h"
-#include "media/base/muxer_util.h"
-#include "media/event/mpd_notify_muxer_listener.h"
-#include "media/event/vod_media_info_dump_muxer_listener.h"
-#include "media/formats/mp4/mp4_muxer.h"
-#include "mpd/base/mpd_builder.h"
-#include "mpd/base/simple_mpd_notifier.h"
+#include "packager/app/fixed_key_encryption_flags.h"
+#include "packager/app/libcrypto_threading.h"
+#include "packager/app/mpd_flags.h"
+#include "packager/app/muxer_flags.h"
+#include "packager/app/packager_util.h"
+#include "packager/app/stream_descriptor.h"
+#include "packager/app/widevine_encryption_flags.h"
+#include "packager/base/logging.h"
+#include "packager/base/stl_util.h"
+#include "packager/base/strings/string_split.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/base/threading/simple_thread.h"
+#include "packager/media/base/demuxer.h"
+#include "packager/media/base/key_source.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/base/muxer_util.h"
+#include "packager/media/event/mpd_notify_muxer_listener.h"
+#include "packager/media/event/vod_media_info_dump_muxer_listener.h"
+#include "packager/media/formats/mp4/mp4_muxer.h"
+#include "packager/mpd/base/mpd_builder.h"
+#include "packager/mpd/base/simple_mpd_notifier.h"
 
 namespace {
 const char kUsage[] =

packager/app/packager_util.cc

@@ -7,20 +7,20 @@
 #include <gflags/gflags.h>
 #include <iostream>
 
-#include "app/fixed_key_encryption_flags.h"
-#include "app/mpd_flags.h"
-#include "app/muxer_flags.h"
-#include "app/widevine_encryption_flags.h"
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "media/base/media_stream.h"
-#include "media/base/muxer.h"
-#include "media/base/muxer_options.h"
-#include "media/base/request_signer.h"
-#include "media/base/stream_info.h"
-#include "media/base/widevine_key_source.h"
-#include "media/file/file.h"
-#include "mpd/base/mpd_builder.h"
+#include "packager/app/fixed_key_encryption_flags.h"
+#include "packager/app/mpd_flags.h"
+#include "packager/app/muxer_flags.h"
+#include "packager/app/widevine_encryption_flags.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/media/base/media_stream.h"
+#include "packager/media/base/muxer.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/base/request_signer.h"
+#include "packager/media/base/stream_info.h"
+#include "packager/media/base/widevine_key_source.h"
+#include "packager/media/file/file.h"
+#include "packager/mpd/base/mpd_builder.h"
 
 DEFINE_bool(dump_stream_info, false, "Dump demuxed stream info.");
 

packager/app/packager_util.h

@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
+#include "packager/base/memory/scoped_ptr.h"
 
 DECLARE_bool(dump_stream_info);
 

packager/app/stream_descriptor.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "app/stream_descriptor.h"
+#include "packager/app/stream_descriptor.h"
 
-#include "app/packager_util.h"
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
+#include "packager/app/packager_util.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/base/strings/string_split.h"
 
 namespace edash_packager {
 namespace media {

packager/app/widevine_encryption_flags.cc

@@ -6,10 +6,10 @@
 //
 // Defines command line flags for widevine_encryption.
 
-#include "app/widevine_encryption_flags.h"
+#include "packager/app/widevine_encryption_flags.h"
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
 
 DEFINE_bool(enable_widevine_encryption,
             false,

packager/common.gypi

@@ -14,6 +14,7 @@
   'target_defaults': {
     'include_dirs': [
       '.',
+      '..',
     ],
     'conditions': [
       ['clang==1', {

packager/media/base/aes_encryptor.cc

@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/aes_encryptor.h"
+#include "packager/media/base/aes_encryptor.h"
 
 #include <openssl/aes.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace {
 

packager/media/base/aes_encryptor.h

@@ -12,8 +12,8 @@
 #include <string>
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
-#include "base/stl_util.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/base/stl_util.h"
 
 struct aes_key_st;
 typedef struct aes_key_st AES_KEY;

packager/media/base/aes_encryptor_unittest.cc

@@ -6,10 +6,10 @@
 
 #include <gtest/gtest.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/strings/string_number_conversions.h"
-#include "media/base/aes_encryptor.h"
+#include "packager/base/logging.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/media/base/aes_encryptor.h"
 
 namespace {
 

packager/media/base/audio_stream_info.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/audio_stream_info.h"
+#include "packager/media/base/audio_stream_info.h"
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/stringprintf.h"
-#include "media/base/limits.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/media/base/limits.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/audio_stream_info.h

@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "media/base/stream_info.h"
+#include "packager/media/base/stream_info.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/audio_timestamp_helper.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/audio_timestamp_helper.h"
+#include "packager/media/base/audio_timestamp_helper.h"
 
-#include "base/logging.h"
-#include "media/base/timestamp.h"
+#include "packager/base/logging.h"
+#include "packager/media/base/timestamp.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/audio_timestamp_helper.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
+#include "packager/base/macros.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/audio_timestamp_helper_unittest.cc

@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
-#include "media/base/audio_timestamp_helper.h"
-#include "media/base/timestamp.h"
+#include "packager/media/base/audio_timestamp_helper.h"
+#include "packager/media/base/timestamp.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/bit_reader.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/bit_reader.h"
+#include "packager/media/base/bit_reader.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/bit_reader.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/bit_reader_unittest.cc

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 
-#include "media/base/bit_reader.h"
+#include "packager/media/base/bit_reader.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/buffer_reader.cc

@@ -4,9 +4,9 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/buffer_reader.h"
+#include "packager/media/base/buffer_reader.h"
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/buffer_reader.h

@@ -11,8 +11,8 @@
 
 #include <vector>
 
-#include "base/compiler_specific.h"
-#include "base/macros.h"
+#include "packager/base/compiler_specific.h"
+#include "packager/base/macros.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/buffer_writer.cc

@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/buffer_writer.h"
+#include "packager/media/base/buffer_writer.h"
 
-#include "base/sys_byteorder.h"
-#include "media/file/file.h"
+#include "packager/base/sys_byteorder.h"
+#include "packager/media/file/file.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/buffer_writer.h

@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "base/stl_util.h"
-#include "media/base/status.h"
+#include "packager/base/stl_util.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/buffer_writer_unittest.cc

@@ -4,15 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/buffer_writer.h"
+#include "packager/media/base/buffer_writer.h"
 
 #include <limits>
 
-#include "base/file_util.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/buffer_reader.h"
-#include "media/base/status_test_util.h"
-#include "media/file/file.h"
+#include "packager/base/file_util.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/buffer_reader.h"
+#include "packager/media/base/status_test_util.h"
+#include "packager/media/file/file.h"
 
 namespace {
 const int kReservedBufferCapacity = 1000;

packager/media/base/byte_queue.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/byte_queue.h"
+#include "packager/media/base/byte_queue.h"
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/byte_queue.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "base/memory/scoped_ptr.h"
+#include "packager/base/memory/scoped_ptr.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/closure_thread.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/closure_thread.h"
+#include "packager/media/base/closure_thread.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/closure_thread.h

@@ -7,8 +7,8 @@
 #ifndef MEDIA_BASE_CLOSURE_THREAD_H_
 #define MEDIA_BASE_CLOSURE_THREAD_H_
 
-#include "base/callback.h"
-#include "base/threading/simple_thread.h"
+#include "packager/base/callback.h"
+#include "packager/base/threading/simple_thread.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/closure_thread_unittest.cc

@@ -7,10 +7,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/waitable_event.h"
-#include "media/base/closure_thread.h"
+#include "packager/base/bind.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/base/synchronization/waitable_event.h"
+#include "packager/media/base/closure_thread.h"
 
 using ::testing::DoAll;
 using ::testing::Invoke;

packager/media/base/container_names.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/container_names.h"
+#include "packager/media/base/container_names.h"
 
 #include <stdint.h>
 
 #include <cctype>
 #include <limits>
 
-#include "base/logging.h"
-#include "media/base/bit_reader.h"
+#include "packager/base/logging.h"
+#include "packager/media/base/bit_reader.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/container_names_unittest.cc

@@ -4,9 +4,9 @@
 
 #include <gtest/gtest.h>
 
-#include "base/file_util.h"
-#include "media/base/container_names.h"
-#include "media/test/test_data_util.h"
+#include "packager/base/file_util.h"
+#include "packager/media/base/container_names.h"
+#include "packager/media/test/test_data_util.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/decrypt_config.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/decrypt_config.h"
+#include "packager/media/base/decrypt_config.h"
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/decrypt_config.h

@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
+#include "packager/base/memory/scoped_ptr.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/decryptor_source.h

@@ -7,9 +7,9 @@
 #ifndef MEDIA_BASE_DECRYPTOR_SOURCE_H_
 #define MEDIA_BASE_DECRYPTOR_SOURCE_H_
 
-#include "base/memory/scoped_ptr.h"
-#include "media/base/container_names.h"
-#include "media/base/status.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/container_names.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/demuxer.cc

@@ -4,21 +4,21 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/demuxer.h"
+#include "packager/media/base/demuxer.h"
 
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/stl_util.h"
-#include "media/base/container_names.h"
-#include "media/base/decryptor_source.h"
-#include "media/base/key_source.h"
-#include "media/base/media_sample.h"
-#include "media/base/media_stream.h"
-#include "media/base/stream_info.h"
-#include "media/file/file.h"
-#include "media/formats/mp2t/mp2t_media_parser.h"
-#include "media/formats/mp4/mp4_media_parser.h"
-#include "media/formats/wvm/wvm_media_parser.h"
+#include "packager/base/bind.h"
+#include "packager/base/logging.h"
+#include "packager/base/stl_util.h"
+#include "packager/media/base/container_names.h"
+#include "packager/media/base/decryptor_source.h"
+#include "packager/media/base/key_source.h"
+#include "packager/media/base/media_sample.h"
+#include "packager/media/base/media_stream.h"
+#include "packager/media/base/stream_info.h"
+#include "packager/media/file/file.h"
+#include "packager/media/formats/mp2t/mp2t_media_parser.h"
+#include "packager/media/formats/mp4/mp4_media_parser.h"
+#include "packager/media/formats/wvm/wvm_media_parser.h"
 
 namespace {
 const size_t kBufSize = 0x40000;  // 256KB.

packager/media/base/demuxer.h

@@ -9,10 +9,10 @@
 
 #include <vector>
 
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/container_names.h"
-#include "media/base/status.h"
+#include "packager/base/memory/ref_counted.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/container_names.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/fake_prng.cc

@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/fake_prng.h"
+#include "packager/media/base/fake_prng.h"
 
 #include <openssl/rand.h>
 
-#include "base/file_util.h"
-#include "base/logging.h"
-#include "media/test/test_data_util.h"
+#include "packager/base/file_util.h"
+#include "packager/base/logging.h"
+#include "packager/media/test/test_data_util.h"
 
 namespace {
 

packager/media/base/http_fetcher.cc

@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/http_fetcher.h"
+#include "packager/media/base/http_fetcher.h"
 
 #include <curl/curl.h>
-#include "base/strings/stringprintf.h"
+#include "packager/base/strings/stringprintf.h"
 
 namespace {
 const char kUserAgentString[] = "edash-packager-http_fetcher/1.0";

packager/media/base/http_fetcher.h

@@ -7,8 +7,8 @@
 #ifndef MEDIA_BASE_HTTP_FETCHER_H_
 #define MEDIA_BASE_HTTP_FETCHER_H_
 
-#include "base/compiler_specific.h"
-#include "media/base/status.h"
+#include "packager/base/compiler_specific.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/http_fetcher_unittest.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/http_fetcher.h"
+#include "packager/media/base/http_fetcher.h"
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
-#include "media/base/status_test_util.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/base/strings/string_util.h"
+#include "packager/media/base/status_test_util.h"
 
 namespace {
 const char kTestUrl[] = "http://packager-test.appspot.com/http_test";

packager/media/base/key_source.cc

@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/key_source.h"
+#include "packager/media/base/key_source.h"
 
-#include "base/strings/string_number_conversions.h"
-#include "media/base/aes_encryptor.h"
-#include "media/base/buffer_writer.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/media/base/aes_encryptor.h"
+#include "packager/media/base/buffer_writer.h"
 
 namespace {
 const uint8_t kWidevineSystemId[] = {0xed, 0xef, 0x8b, 0xa9, 0x79, 0xd6,

packager/media/base/key_source.h

@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
-#include "media/base/status.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/media_parser.h

@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/container_names.h"
+#include "packager/base/callback.h"
+#include "packager/base/memory/ref_counted.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/container_names.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/media_sample.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/media_sample.h"
+#include "packager/media/base/media_sample.h"
 
 #include <inttypes.h>
 
-#include "base/logging.h"
-#include "base/strings/stringprintf.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/stringprintf.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/media_sample.h

@@ -11,9 +11,9 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
+#include "packager/base/logging.h"
+#include "packager/base/memory/ref_counted.h"
+#include "packager/base/memory/scoped_ptr.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/media_stream.cc

@@ -4,14 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/media_stream.h"
+#include "packager/media/base/media_stream.h"
 
-#include "base/logging.h"
-#include "base/strings/stringprintf.h"
-#include "media/base/demuxer.h"
-#include "media/base/media_sample.h"
-#include "media/base/muxer.h"
-#include "media/base/stream_info.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/media/base/demuxer.h"
+#include "packager/media/base/media_sample.h"
+#include "packager/media/base/muxer.h"
+#include "packager/media/base/stream_info.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/media_stream.h

@@ -9,9 +9,9 @@
 
 #include <deque>
 
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/status.h"
+#include "packager/base/memory/ref_counted.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/muxer.cc

@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/muxer.h"
+#include "packager/media/base/muxer.h"
 
-#include "media/base/media_sample.h"
-#include "media/base/media_stream.h"
+#include "packager/media/base/media_sample.h"
+#include "packager/media/base/media_stream.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/muxer.h

@@ -11,11 +11,11 @@
 
 #include <vector>
 
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/time/clock.h"
-#include "media/base/muxer_options.h"
-#include "media/base/status.h"
+#include "packager/base/memory/ref_counted.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/base/time/clock.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/muxer_options.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/muxer_options.h"
+#include "packager/media/base/muxer_options.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/muxer_util.cc

@@ -4,17 +4,17 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/muxer_util.h"
+#include "packager/media/base/muxer_util.h"
 
 #include <inttypes.h>
 
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
-#include "base/strings/stringprintf.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/base/strings/string_split.h"
+#include "packager/base/strings/stringprintf.h"
 
 namespace edash_packager {
 namespace {

packager/media/base/muxer_util_unittest.cc

@@ -6,7 +6,7 @@
 
 #include <gtest/gtest.h>
 
-#include "media/base/muxer_util.h"
+#include "packager/media/base/muxer_util.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/network_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/network_util.h"
+#include "packager/media/base/network_util.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/offset_byte_queue.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/offset_byte_queue.h"
+#include "packager/media/base/offset_byte_queue.h"
 
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/offset_byte_queue.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "media/base/byte_queue.h"
+#include "packager/media/base/byte_queue.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/offset_byte_queue_unittest.cc

@@ -6,8 +6,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "base/memory/scoped_ptr.h"
-#include "media/base/offset_byte_queue.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/offset_byte_queue.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/producer_consumer_queue.h

@@ -9,11 +9,11 @@
 
 #include <deque>
 
-#include "base/strings/stringprintf.h"
-#include "base/synchronization/condition_variable.h"
-#include "base/synchronization/lock.h"
-#include "base/timer/elapsed_timer.h"
-#include "media/base/status.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/base/synchronization/condition_variable.h"
+#include "packager/base/synchronization/lock.h"
+#include "packager/base/timer/elapsed_timer.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/producer_consumer_queue_unittest.cc

@@ -6,11 +6,11 @@
 
 #include <gtest/gtest.h>
 
-#include "base/bind.h"
-#include "base/synchronization/waitable_event.h"
-#include "media/base/closure_thread.h"
-#include "media/base/producer_consumer_queue.h"
-#include "media/base/status_test_util.h"
+#include "packager/base/bind.h"
+#include "packager/base/synchronization/waitable_event.h"
+#include "packager/media/base/closure_thread.h"
+#include "packager/media/base/producer_consumer_queue.h"
+#include "packager/media/base/status_test_util.h"
 
 namespace {
 const size_t kCapacity = 10u;

packager/media/base/request_signer.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/request_signer.h"
+#include "packager/media/base/request_signer.h"
 
-#include "base/sha1.h"
-#include "base/strings/string_number_conversions.h"
-#include "media/base/aes_encryptor.h"
-#include "media/base/rsa_key.h"
+#include "packager/base/sha1.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/media/base/aes_encryptor.h"
+#include "packager/media/base/rsa_key.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/request_signer.h

@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
+#include "packager/base/memory/scoped_ptr.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/rsa_key.cc

@@ -16,16 +16,16 @@
 //   Mask generation function: mgf1SHA1
 //   Label (encoding paramter): empty std::string
 
-#include "media/base/rsa_key.h"
+#include "packager/media/base/rsa_key.h"
 
 #include <openssl/err.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include <vector>
 
-#include "base/logging.h"
-#include "base/sha1.h"
-#include "base/stl_util.h"
+#include "packager/base/logging.h"
+#include "packager/base/sha1.h"
+#include "packager/base/stl_util.h"
 
 namespace {
 

packager/media/base/rsa_key.h

@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "base/macros.h"
+#include "packager/base/macros.h"
 
 struct rsa_st;
 typedef struct rsa_st RSA;

packager/media/base/rsa_key_unittest.cc

@@ -8,10 +8,10 @@
 
 #include <gtest/gtest.h>
 
-#include "base/memory/scoped_ptr.h"
-#include "media/base/fake_prng.h"
-#include "media/base/rsa_key.h"
-#include "media/base/rsa_test_data.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/fake_prng.h"
+#include "packager/media/base/rsa_key.h"
+#include "packager/media/base/rsa_test_data.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/rsa_test_data.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/rsa_test_data.h"
+#include "packager/media/base/rsa_test_data.h"
 
 #include <stdint.h>
 

packager/media/base/rsa_test_data.h

@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "base/macros.h"
+#include "packager/base/macros.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/status.cc

@@ -4,9 +4,9 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/status.h"
+#include "packager/media/base/status.h"
 
-#include "base/strings/stringprintf.h"
+#include "packager/base/strings/stringprintf.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/status.h

@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "base/logging.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/status_test_util.h

@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 
-#include "media/base/status.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/status_test_util_unittest.cc

@@ -6,7 +6,7 @@
 
 #include <gtest/gtest-spi.h>
 
-#include "media/base/status_test_util.h"
+#include "packager/media/base/status_test_util.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/status_unittest.cc

@@ -7,8 +7,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "base/strings/string_number_conversions.h"
-#include "media/base/status.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/media/base/status.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/stream_info.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/stream_info.h"
+#include "packager/media/base/stream_info.h"
 
 #include <inttypes.h>
 
-#include "base/logging.h"
-#include "base/strings/stringprintf.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/stringprintf.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/stream_info.h

@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "base/memory/ref_counted.h"
+#include "packager/base/memory/ref_counted.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/text_track.h

@@ -7,9 +7,9 @@
 
 #include <string>
 
-#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/time/time.h"
+#include "packager/base/callback.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/base/time/time.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/video_stream_info.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/video_stream_info.h"
+#include "packager/media/base/video_stream_info.h"
 
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
-#include "media/base/limits.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/base/strings/string_util.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/media/base/limits.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/video_stream_info.h

@@ -7,7 +7,7 @@
 #ifndef MEDIA_BASE_VIDEO_STREAM_INFO_H_
 #define MEDIA_BASE_VIDEO_STREAM_INFO_H_
 
-#include "media/base/stream_info.h"
+#include "packager/media/base/stream_info.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/widevine_key_source.cc

@@ -4,17 +4,17 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/widevine_key_source.h"
+#include "packager/media/base/widevine_key_source.h"
 
-#include "base/base64.h"
-#include "base/bind.h"
-#include "base/json/json_reader.h"
-#include "base/json/json_writer.h"
-#include "base/memory/ref_counted.h"
-#include "base/stl_util.h"
-#include "media/base/http_fetcher.h"
-#include "media/base/producer_consumer_queue.h"
-#include "media/base/request_signer.h"
+#include "packager/base/base64.h"
+#include "packager/base/bind.h"
+#include "packager/base/json/json_reader.h"
+#include "packager/base/json/json_writer.h"
+#include "packager/base/memory/ref_counted.h"
+#include "packager/base/stl_util.h"
+#include "packager/media/base/http_fetcher.h"
+#include "packager/media/base/producer_consumer_queue.h"
+#include "packager/media/base/request_signer.h"
 
 #define RCHECK(x)                                       \
   do {                                                  \

packager/media/base/widevine_key_source.h

@@ -9,11 +9,11 @@
 
 #include <map>
 
-#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/waitable_event.h"
-#include "base/values.h"
-#include "media/base/closure_thread.h"
-#include "media/base/key_source.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/base/synchronization/waitable_event.h"
+#include "packager/base/values.h"
+#include "packager/media/base/closure_thread.h"
+#include "packager/media/base/key_source.h"
 
 namespace edash_packager {
 namespace media {

packager/media/base/widevine_key_source_unittest.cc

@@ -7,13 +7,13 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "base/base64.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/stringprintf.h"
-#include "media/base/http_fetcher.h"
-#include "media/base/request_signer.h"
-#include "media/base/status_test_util.h"
-#include "media/base/widevine_key_source.h"
+#include "packager/base/base64.h"
+#include "packager/base/strings/string_number_conversions.h"
+#include "packager/base/strings/stringprintf.h"
+#include "packager/media/base/http_fetcher.h"
+#include "packager/media/base/request_signer.h"
+#include "packager/media/base/status_test_util.h"
+#include "packager/media/base/widevine_key_source.h"
 
 namespace {
 const char kServerUrl[] = "http://www.foo.com/getcontentkey";

packager/media/event/mpd_notify_muxer_listener.cc

@@ -4,16 +4,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/event/mpd_notify_muxer_listener.h"
+#include "packager/media/event/mpd_notify_muxer_listener.h"
 
 #include <cmath>
 
-#include "base/logging.h"
-#include "media/base/audio_stream_info.h"
-#include "media/base/video_stream_info.h"
-#include "media/event/muxer_listener_internal.h"
-#include "mpd/base/media_info.pb.h"
-#include "mpd/base/mpd_notifier.h"
+#include "packager/base/logging.h"
+#include "packager/media/base/audio_stream_info.h"
+#include "packager/media/base/video_stream_info.h"
+#include "packager/media/event/muxer_listener_internal.h"
+#include "packager/mpd/base/media_info.pb.h"
+#include "packager/mpd/base/mpd_notifier.h"
 
 namespace edash_packager {
 namespace media {

packager/media/event/mpd_notify_muxer_listener.h

@@ -11,10 +11,10 @@
 
 #include <vector>
 
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/muxer_options.h"
-#include "media/event/muxer_listener.h"
+#include "packager/base/compiler_specific.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/event/muxer_listener.h"
 
 namespace edash_packager {
 

packager/media/event/muxer_listener_internal.cc

@@ -4,15 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/event/muxer_listener_internal.h"
+#include "packager/media/event/muxer_listener_internal.h"
 
 #include <math.h>
 
-#include "base/logging.h"
-#include "media/base/audio_stream_info.h"
-#include "media/base/muxer_options.h"
-#include "media/base/video_stream_info.h"
-#include "mpd/base/media_info.pb.h"
+#include "packager/base/logging.h"
+#include "packager/media/base/audio_stream_info.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/base/video_stream_info.h"
+#include "packager/mpd/base/media_info.pb.h"
 
 namespace edash_packager {
 namespace media {

packager/media/event/muxer_listener_internal.h

@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "media/event/muxer_listener.h"
+#include "packager/media/event/muxer_listener.h"
 
 namespace edash_packager {
 

packager/media/event/vod_media_info_dump_muxer_listener.cc

@@ -4,16 +4,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/event/vod_media_info_dump_muxer_listener.h"
+#include "packager/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 "packager/base/logging.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/base/stream_info.h"
+#include "packager/media/event/muxer_listener_internal.h"
+#include "packager/media/file/file.h"
+#include "packager/mpd/base/media_info.pb.h"
 
 namespace edash_packager {
 namespace media {

packager/media/event/vod_media_info_dump_muxer_listener.h

@@ -14,10 +14,10 @@
 #include <string>
 #include <vector>
 
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/muxer_options.h"
-#include "media/event/muxer_listener.h"
+#include "packager/base/compiler_specific.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/event/muxer_listener.h"
 
 namespace edash_packager {
 

packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc

@@ -9,14 +9,14 @@
 
 #include <vector>
 
-#include "base/file_util.h"
-#include "base/files/file_path.h"
-#include "base/stl_util.h"
-#include "media/event/vod_media_info_dump_muxer_listener.h"
-#include "media/file/file.h"
-#include "media/base/muxer_options.h"
-#include "media/base/video_stream_info.h"
-#include "mpd/base/media_info.pb.h"
+#include "packager/base/file_util.h"
+#include "packager/base/files/file_path.h"
+#include "packager/base/stl_util.h"
+#include "packager/media/event/vod_media_info_dump_muxer_listener.h"
+#include "packager/media/file/file.h"
+#include "packager/media/base/muxer_options.h"
+#include "packager/media/base/video_stream_info.h"
+#include "packager/mpd/base/media_info.pb.h"
 
 namespace {
 const bool kEnableEncryption = true;

packager/media/file/file.cc

@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/file/file.h"
+#include "packager/media/file/file.h"
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/file/local_file.h"
-#include "media/file/udp_file.h"
-#include "base/strings/string_util.h"
+#include "packager/base/logging.h"
+#include "packager/base/memory/scoped_ptr.h"
+#include "packager/media/file/local_file.h"
+#include "packager/media/file/udp_file.h"
+#include "packager/base/strings/string_util.h"
 
 namespace edash_packager {
 namespace media {

packager/media/file/file.h

@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "base/macros.h"
+#include "packager/base/macros.h"
 
 namespace edash_packager {
 namespace media {

packager/media/file/file_closer.h

@@ -7,8 +7,8 @@
 #ifndef MEDIA_FILE_FILE_CLOSER_H_
 #define MEDIA_FILE_FILE_CLOSER_H_
 
-#include "base/logging.h"
-#include "media/file/file.h"
+#include "packager/base/logging.h"
+#include "packager/media/file/file.h"
 
 namespace edash_packager {
 namespace media {

packager/media/file/file_unittest.cc

@@ -6,8 +6,8 @@
 
 #include <gtest/gtest.h>
 
-#include "base/file_util.h"
-#include "media/file/file.h"
+#include "packager/base/file_util.h"
+#include "packager/media/file/file.h"
 
 namespace {
 const int kDataSize = 1024;

packager/media/file/local_file.cc

@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/file/local_file.h"
+#include "packager/media/file/local_file.h"
 
-#include "base/file_util.h"
-#include "base/logging.h"
+#include "packager/base/file_util.h"
+#include "packager/base/logging.h"
 
 namespace edash_packager {
 namespace media {

packager/media/file/local_file.h

@@ -11,8 +11,8 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
-#include "media/file/file.h"
+#include "packager/base/compiler_specific.h"
+#include "packager/media/file/file.h"
 
 namespace edash_packager {
 namespace media {

packager/media/file/udp_file.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/file/udp_file.h"
+#include "packager/media/file/udp_file.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
@@ -15,8 +15,8 @@
 
 #include <limits>
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
+#include "packager/base/logging.h"
+#include "packager/base/strings/string_number_conversions.h"
 
 // TODO(tinskip): Adapt to work with winsock.
 

packager/media/file/udp_file.h

@@ -11,8 +11,8 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
-#include "media/file/file.h"
+#include "packager/base/compiler_specific.h"
+#include "packager/media/file/file.h"
 
 namespace edash_packager {
 namespace media {

packager/media/filters/h264_bit_reader.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
-#include "media/filters/h264_bit_reader.h"
+#include "packager/base/logging.h"
+#include "packager/media/filters/h264_bit_reader.h"
 
 namespace edash_packager {
 namespace media {

packager/media/filters/h264_bit_reader.h

@@ -10,7 +10,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "base/macros.h"
+#include "packager/base/macros.h"
 
 namespace edash_packager {
 namespace media {