diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:40:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:40:45 +0000 |
| commit | 906265870c8a3cc44ebbcad14eaea84559a49aed (patch) | |
| tree | fc025f2e228464be651f0ea502fb7415467e8278 /skia | |
| parent | 3aef722b8c533efc87df683a454f0779f9b6cabb (diff) | |
| download | chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.zip chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.gz chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.bz2 | |
Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, printing/, remoting/, rlz/, skia/, sql/, sync/, third_party/, tools/, webkit/, win8/.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15995038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/image_operations_bench.cc | 2 | ||||
| -rw-r--r-- | skia/ext/vector_canvas_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/skia/ext/image_operations_bench.cc b/skia/ext/image_operations_bench.cc index 0a56650..3234820 100644 --- a/skia/ext/image_operations_bench.cc +++ b/skia/ext/image_operations_bench.cc @@ -22,8 +22,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index 59f70e6..b07a776 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -13,7 +13,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "skia/ext/vector_canvas.h" #include "skia/ext/vector_platform_device_emf_win.h" #include "testing/gtest/include/gtest/gtest.h" |