summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 19:08:35 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 19:08:35 +0000
commitdcb233007a87c6f7afd7ab329e6ab23830364000 (patch)
treec7d33ddc2979cfdc67d0e57628e224b13bfad5f7 /android_webview
parentd529cb08d1153a4258ececebb0fe18bcc76f3281 (diff)
downloadchromium_src-dcb233007a87c6f7afd7ab329e6ab23830364000.zip
chromium_src-dcb233007a87c6f7afd7ab329e6ab23830364000.tar.gz
chromium_src-dcb233007a87c6f7afd7ab329e6ab23830364000.tar.bz2
Use a direct include of strings headers in android_webview/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16599011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_devtools_delegate.cc2
-rw-r--r--android_webview/browser/aw_login_delegate.h2
-rw-r--r--android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc2
-rw-r--r--android_webview/common/aw_hit_test_data.h2
-rw-r--r--android_webview/native/android_protocol_handler.cc2
-rw-r--r--android_webview/native/aw_contents.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/android_webview/browser/aw_devtools_delegate.cc b/android_webview/browser/aw_devtools_delegate.cc
index 7d367b4..4718f47 100644
--- a/android_webview/browser/aw_devtools_delegate.cc
+++ b/android_webview/browser/aw_devtools_delegate.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/json/json_writer.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "content/public/browser/android/devtools_auth.h"
#include "content/public/browser/devtools_http_handler.h"
diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h
index d4404ec..2542f06 100644
--- a/android_webview/browser/aw_login_delegate.h
+++ b/android_webview/browser/aw_login_delegate.h
@@ -8,7 +8,7 @@
#include "android_webview/browser/aw_http_auth_handler_base.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
namespace net {
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
index 33e826c..a6117c6 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -9,7 +9,7 @@
#include "base/format_macros.h"
#include "base/message_loop.h"
#include "base/run_loop.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "net/url_request/url_request_test_util.h"
diff --git a/android_webview/common/aw_hit_test_data.h b/android_webview/common/aw_hit_test_data.h
index 845aeb5..14cce60 100644
--- a/android_webview/common/aw_hit_test_data.h
+++ b/android_webview/common/aw_hit_test_data.h
@@ -5,7 +5,7 @@
#ifndef ANDROID_WEBVIEW_COMMON_AW_HIT_TEST_DATA_H_
#define ANDROID_WEBVIEW_COMMON_AW_HIT_TEST_DATA_H_
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "googleurl/src/gurl.h"
namespace android_webview {
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
index 7705e84..ff03591 100644
--- a/android_webview/native/android_protocol_handler.cc
+++ b/android_webview/native/android_protocol_handler.cc
@@ -11,7 +11,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_helper.h"
#include "base/android/jni_string.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "content/public/common/url_constants.h"
#include "googleurl/src/gurl.h"
#include "jni/AndroidProtocolHandler_jni.h"
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 359ecbb..9fd0edd 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -26,7 +26,7 @@
#include "base/callback.h"
#include "base/message_loop.h"
#include "base/pickle.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/supports_user_data.h"
#include "components/autofill/browser/autofill_external_delegate.h"
#include "components/autofill/browser/autofill_manager.h"