summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 07:28:19 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 07:28:19 +0000
commita4bbc1f9b821dee29561beb13bc8d42eadfb0f6a (patch)
treef88ce6b64021181379d4627c2c666dbd46286314 /skia
parent0d8db08c32735b1fd916495227802d933b308991 (diff)
downloadchromium_src-a4bbc1f9b821dee29561beb13bc8d42eadfb0f6a.zip
chromium_src-a4bbc1f9b821dee29561beb13bc8d42eadfb0f6a.tar.gz
chromium_src-a4bbc1f9b821dee29561beb13bc8d42eadfb0f6a.tar.bz2
Use a direct include of strings headers in rlz/, sandbox/, skia/, sql/, sync/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16358024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/google_logging.cc2
-rw-r--r--skia/ext/image_operations_bench.cc4
-rw-r--r--skia/ext/image_operations_unittest.cc2
-rw-r--r--skia/ext/vector_canvas_unittest.cc4
-rw-r--r--skia/ext/vector_platform_device_emf_win.cc2
5 files changed, 7 insertions, 7 deletions
diff --git a/skia/ext/google_logging.cc b/skia/ext/google_logging.cc
index 5e8ffe1..673e23a 100644
--- a/skia/ext/google_logging.cc
+++ b/skia/ext/google_logging.cc
@@ -7,7 +7,7 @@
// that provides integration with the logging of your choice.
#include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "third_party/skia/include/core/SkTypes.h"
void SkDebugf_FileLine(const char* file, int line, bool fatal,
diff --git a/skia/ext/image_operations_bench.cc b/skia/ext/image_operations_bench.cc
index 3234820..e7dd64d 100644
--- a/skia/ext/image_operations_bench.cc
+++ b/skia/ext/image_operations_bench.cc
@@ -19,9 +19,9 @@
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/format_macros.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "skia/ext/image_operations.h"
diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc
index fead994..9fce74b 100644
--- a/skia/ext/image_operations_unittest.cc
+++ b/skia/ext/image_operations_unittest.cc
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "skia/ext/image_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index b07a776..a087aed 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -11,8 +11,8 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "skia/ext/vector_canvas.h"
#include "skia/ext/vector_platform_device_emf_win.h"
diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc
index bcbc27a..5c58dc1 100644
--- a/skia/ext/vector_platform_device_emf_win.cc
+++ b/skia/ext/vector_platform_device_emf_win.cc
@@ -7,7 +7,7 @@
#include <windows.h>
#include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "skia/ext/bitmap_platform_device.h"
#include "skia/ext/skia_utils_win.h"
#include "third_party/skia/include/core/SkFontHost.h"