content: Migrate from googleurl/ includes to url/ ones.

BUG=229660
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/18868005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210626 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 18 insertions, 18 deletions

diff --git a/content/common/common_param_traits_unittest.cc b/content/common/common_param_traits_unittest.cc
index 432f8f9..1b4ef7e 100644
--- a/content/common/common_param_traits_unittest.cc
+++ b/content/common/common_param_traits_unittest.cc
@@ -8,7 +8,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "content/public/common/common_param_traits.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/host_port_pair.h"
@@ -17,6 +16,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
+#include "url/gurl.h"
 
 // Tests that serialize/deserialize correctly understand each other
 TEST(IPCMessageTest, Serialize) {
diff --git a/content/common/dom_storage_messages.h b/content/common/dom_storage_messages.h
index 689c80b..da847eca 100644
--- a/content/common/dom_storage_messages.h
+++ b/content/common/dom_storage_messages.h
@@ -4,10 +4,10 @@
 
 // Multiply-included message file, no traditional include guard.
 #include "content/public/common/common_param_traits.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/public/platform/WebStorageArea.h"
+#include "url/gurl.h"
 #include "webkit/common/dom_storage/dom_storage_types.h"
 
 #define IPC_MESSAGE_START DOMStorageMsgStart
diff --git a/content/common/fileapi/file_system_messages.h b/content/common/fileapi/file_system_messages.h
index 37badb0..e6f583e 100644
--- a/content/common/fileapi/file_system_messages.h
+++ b/content/common/fileapi/file_system_messages.h
@@ -5,9 +5,9 @@
 // IPC messages for the file system.
 // Multiply-included message file, hence no include guard.
 
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
+#include "url/gurl.h"
 #include "webkit/common/fileapi/directory_entry.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
diff --git a/content/common/geolocation_messages.h b/content/common/geolocation_messages.h
index eac9200..2c70a74 100644
--- a/content/common/geolocation_messages.h
+++ b/content/common/geolocation_messages.h
@@ -6,8 +6,8 @@
 // Multiply-included message file, hence no include guard.
 
 #include "content/public/common/geoposition.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
+#include "url/gurl.h"
 
 #define IPC_MESSAGE_START GeolocationMsgStart
 
diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc
index fc6e89d..6cc5c9b 100644
--- a/content/common/gpu/client/gpu_channel_host.cc
+++ b/content/common/gpu/client/gpu_channel_host.cc
@@ -14,9 +14,9 @@
 #include "base/threading/thread_restrictions.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "googleurl/src/gurl.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "ipc/ipc_sync_message_filter.h"
+#include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "content/public/common/sandbox_init.h"
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
index 5fdab9d..a1f2f66 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
@@ -14,11 +14,11 @@
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
-#include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "ui/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gl/gpu_preference.h"
+#include "url/gurl.h"
 
 namespace gpu {
 
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 131a5a0..0ca5d9b 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -16,7 +16,6 @@
 #include "content/common/gpu/gpu_memory_allocation.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_memory_manager_client.h"
-#include "googleurl/src/gurl.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
@@ -29,6 +28,7 @@
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gpu_preference.h"
+#include "url/gurl.h"
 
 namespace gpu {
 struct Mailbox;
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index bddb72c..4120943 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -11,11 +11,11 @@
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/media_keys.h"
 #include "ui/gfx/rect_f.h"
+#include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h
index bb7a529..8678997 100644
--- a/content/common/media/media_stream_messages.h
+++ b/content/common/media/media_stream_messages.h
@@ -9,8 +9,8 @@
 
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
+#include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
diff --git a/content/common/media/webrtc_identity_messages.h b/content/common/media/webrtc_identity_messages.h
index 4f115bcb..c9287d2 100644
--- a/content/common/media/webrtc_identity_messages.h
+++ b/content/common/media/webrtc_identity_messages.h
@@ -5,8 +5,8 @@
 // IPC messages for requesting WebRTC identity.
 // Multiply-included message file, hence no include guard.
 
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
+#include "url/gurl.h"
 
 #define IPC_MESSAGE_START WebRTCIdentityMsgStart
 
diff --git a/content/common/page_state_serialization.h b/content/common/page_state_serialization.h
index 955c7a6..c5057ac 100644
--- a/content/common/page_state_serialization.h
+++ b/content/common/page_state_serialization.h
@@ -9,9 +9,9 @@
 
 #include "base/strings/nullable_string16.h"
 #include "content/common/content_export.h"
-#include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "ui/gfx/point.h"
+#include "url/gurl.h"
 
 namespace content {
 
diff --git a/content/common/pepper_renderer_instance_data.h b/content/common/pepper_renderer_instance_data.h
index b912792..ffa0106 100644
--- a/content/common/pepper_renderer_instance_data.h
+++ b/content/common/pepper_renderer_instance_data.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_COMMON_PEPPER_RENDERER_INSTANCE_DATA_H_
 #define CONTENT_COMMON_PEPPER_RENDERER_INSTANCE_DATA_H_
 
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace content {
 
diff --git a/content/common/quota_messages.h b/content/common/quota_messages.h
index 03e9437..b7b45b8 100644
--- a/content/common/quota_messages.h
+++ b/content/common/quota_messages.h
@@ -5,8 +5,8 @@
 // Multiply-included message file, hence no include guard.
 
 #include "base/basictypes.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
+#include "url/gurl.h"
 #include "webkit/common/quota/quota_types.h"
 
 #define IPC_MESSAGE_START QuotaMsgStart
diff --git a/content/common/socket_stream_messages.h b/content/common/socket_stream_messages.h
index 47eea33..f463741 100644
--- a/content/common/socket_stream_messages.h
+++ b/content/common/socket_stream_messages.h
@@ -6,9 +6,9 @@
 #include <vector>
 
 #include "content/common/content_export.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
+#include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index e784923..c7446a3 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -15,7 +15,7 @@
 #include "content/common/savable_url_schemes.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
-#include "googleurl/src/url_util.h"
+#include "url/url_util.h"
 
 namespace {
 
diff --git a/content/common/websocket_messages.h b/content/common/websocket_messages.h
index 67407b0..a3dd68c 100644
--- a/content/common/websocket_messages.h
+++ b/content/common/websocket_messages.h
@@ -19,8 +19,8 @@
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/common/websocket.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
+#include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
diff --git a/content/common/worker_messages.h b/content/common/worker_messages.h
index ea41f65..e93e44f 100644
--- a/content/common/worker_messages.h
+++ b/content/common/worker_messages.h
@@ -14,10 +14,10 @@
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
-#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebSharedWorker.h"
+#include "url/gurl.h"
 
 // Singly-included section, not converted.
 #ifndef CONTENT_COMMON_WORKER_MESSAGES_H_