diff options
Diffstat (limited to 'android_webview')
7 files changed, 8 insertions, 9 deletions
diff --git a/android_webview/common/aw_hit_test_data.h b/android_webview/common/aw_hit_test_data.h index 14cce60..d72bcf7 100644 --- a/android_webview/common/aw_hit_test_data.h +++ b/android_webview/common/aw_hit_test_data.h @@ -6,7 +6,7 @@ #define ANDROID_WEBVIEW_COMMON_AW_HIT_TEST_DATA_H_ #include "base/strings/string16.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace android_webview { diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc index ff03591..407f62f 100644 --- a/android_webview/native/android_protocol_handler.cc +++ b/android_webview/native/android_protocol_handler.cc @@ -13,7 +13,6 @@ #include "base/android/jni_string.h" #include "base/strings/string_util.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "jni/AndroidProtocolHandler_jni.h" #include "net/base/io_buffer.h" #include "net/base/mime_util.h" @@ -22,6 +21,7 @@ #include "net/http/http_util.h" #include "net/url_request/protocol_intercept_job_factory.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" using android_webview::InputStream; using android_webview::InputStreamImpl; diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc index 213646f..c044197 100644 --- a/android_webview/native/aw_contents_client_bridge.cc +++ b/android_webview/native/aw_contents_client_bridge.cc @@ -9,9 +9,9 @@ #include "base/android/jni_string.h" #include "base/callback.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "jni/AwContentsClientBridge_jni.h" #include "net/cert/x509_certificate.h" +#include "url/gurl.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; diff --git a/android_webview/native/aw_contents_io_thread_client_impl.cc b/android_webview/native/aw_contents_io_thread_client_impl.cc index 226ba55..81ea0de 100644 --- a/android_webview/native/aw_contents_io_thread_client_impl.cc +++ b/android_webview/native/aw_contents_io_thread_client_impl.cc @@ -20,10 +20,9 @@ #include "content/public/browser/resource_request_info.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" -#include "googleurl/src/gurl.h" -#include "net/url_request/url_request.h" - #include "jni/AwContentsIoThreadClient_jni.h" +#include "net/url_request/url_request.h" +#include "url/gurl.h" using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; diff --git a/android_webview/native/aw_quota_manager_bridge_impl.cc b/android_webview/native/aw_quota_manager_bridge_impl.cc index 4d1ffd8..6427588 100644 --- a/android_webview/native/aw_quota_manager_bridge_impl.cc +++ b/android_webview/native/aw_quota_manager_bridge_impl.cc @@ -13,8 +13,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/content_client.h" -#include "googleurl/src/gurl.h" #include "jni/AwQuotaManagerBridge_jni.h" +#include "url/gurl.h" #include "webkit/browser/quota/quota_manager.h" #include "webkit/common/quota/quota_types.h" diff --git a/android_webview/native/state_serializer_unittests.cc b/android_webview/native/state_serializer_unittests.cc index cb245f4..f592d29 100644 --- a/android_webview/native/state_serializer_unittests.cc +++ b/android_webview/native/state_serializer_unittests.cc @@ -14,8 +14,8 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/common/content_client.h" #include "content/public/common/page_state.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using std::string; diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index 5e7f370..211c3ef 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -13,13 +13,13 @@ #include "components/autofill/content/renderer/password_autofill_agent.h" #include "components/visitedlink/renderer/visitedlink_slave.h" #include "content/public/renderer/render_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "url/gurl.h" namespace android_webview { |