diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 08:04:16 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 08:04:16 +0000 |
commit | 66cbe221405716e58c9e22d877b3c58fcb8ed656 (patch) | |
tree | da0b191e6526f6c33b32219db087eedf8edc4c58 /third_party/zlib | |
parent | 5c073323e30996ee25724abdb3cbd0e68d0e566a (diff) | |
download | chromium_src-66cbe221405716e58c9e22d877b3c58fcb8ed656.zip chromium_src-66cbe221405716e58c9e22d877b3c58fcb8ed656.tar.gz chromium_src-66cbe221405716e58c9e22d877b3c58fcb8ed656.tar.bz2 |
Use a direct include of strings headers in testing/, third_party/, tools/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15851009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r-- | third_party/zlib/google/zip.cc | 4 | ||||
-rw-r--r-- | third_party/zlib/google/zip_reader.cc | 2 | ||||
-rw-r--r-- | third_party/zlib/google/zip_unittest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/third_party/zlib/google/zip.cc b/third_party/zlib/google/zip.cc index 2e46bed..881c0ca 100644 --- a/third_party/zlib/google/zip.cc +++ b/third_party/zlib/google/zip.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/logging.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "net/base/file_stream.h" #include "third_party/zlib/google/zip_internal.h" #include "third_party/zlib/google/zip_reader.h" diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc index e1f6cdd..d29082c 100644 --- a/third_party/zlib/google/zip_reader.cc +++ b/third_party/zlib/google/zip_reader.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.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_unittest.cc b/third_party/zlib/google/zip_unittest.cc index e5d800b..40f776b 100644 --- a/third_party/zlib/google/zip_unittest.cc +++ b/third_party/zlib/google/zip_unittest.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/zlib/google/zip.h" |