diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/leveldatabase/env_chromium.cc | 2 | ||||
| -rw-r--r-- | third_party/zlib/google/zip_internal.cc | 2 | ||||
| -rw-r--r-- | third_party/zlib/google/zip_reader.cc | 2 | ||||
| -rw-r--r-- | third_party/zlib/google/zip_reader_unittest.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index d88f460..ae3f551 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc @@ -17,11 +17,11 @@ #include "base/metrics/histogram.h" #include "base/platform_file.h" #include "base/posix/eintr_wrapper.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/sys_info.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "chromium_logger.h" #include "env_chromium.h" #include "leveldb/env.h" diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc index 3a3a51a..b4f54d5 100644 --- a/third_party/zlib/google/zip_internal.cc +++ b/third_party/zlib/google/zip_internal.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #if defined(USE_SYSTEM_MINIZIP) #include <minizip/ioapi.h> diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc index 5433b04..e1f6cdd 100644 --- a/third_party/zlib/google/zip_reader.cc +++ b/third_party/zlib/google/zip_reader.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "net/base/file_stream.h" #include "third_party/zlib/google/zip_internal.h" diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/third_party/zlib/google/zip_reader_unittest.cc index a12b04e..a47ac53 100644 --- a/third_party/zlib/google/zip_reader_unittest.cc +++ b/third_party/zlib/google/zip_reader_unittest.cc @@ -13,8 +13,8 @@ #include "base/md5.h" #include "base/path_service.h" #include "base/platform_file.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/zlib/google/zip_internal.h" |