diff options
170 files changed, 180 insertions, 181 deletions
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index 3dacb5b..2464706 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h @@ -19,10 +19,10 @@ #include "content/public/browser/android/content_view_core.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_f.h" +#include "url/gurl.h" struct WebMenuItem; diff --git a/content/browser/android/download_controller_android_impl.h b/content/browser/android/download_controller_android_impl.h index c8a0ea2..db9b9cf 100644 --- a/content/browser/android/download_controller_android_impl.h +++ b/content/browser/android/download_controller_android_impl.h @@ -27,8 +27,8 @@ #include "base/memory/singleton.h" #include "content/public/browser/android/download_controller_android.h" #include "content/public/browser/download_item.h" -#include "googleurl/src/gurl.h" #include "net/cookies/cookie_monster.h" +#include "url/gurl.h" namespace net { class URLRequest; diff --git a/content/browser/android/load_url_params.cc b/content/browser/android/load_url_params.cc index c5e2966..57eff2d 100644 --- a/content/browser/android/load_url_params.cc +++ b/content/browser/android/load_url_params.cc @@ -9,8 +9,8 @@ #include "base/android/jni_string.h" #include "content/public/browser/navigation_controller.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "jni/LoadUrlParams_jni.h" +#include "url/gurl.h" namespace { diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h index 41f7c06..98fcc42 100644 --- a/content/browser/android/media_player_manager_impl.h +++ b/content/browser/android/media_player_manager_impl.h @@ -16,11 +16,11 @@ #include "base/time/time.h" #include "content/browser/android/content_video_view.h" #include "content/public/browser/render_view_host_observer.h" -#include "googleurl/src/gurl.h" #include "media/base/android/demuxer_stream_player_params.h" #include "media/base/android/media_player_android.h" #include "media/base/android/media_player_manager.h" #include "ui/gfx/rect_f.h" +#include "url/gurl.h" namespace media { class MediaDrmBridge; diff --git a/content/browser/android/media_resource_getter_impl.cc b/content/browser/android/media_resource_getter_impl.cc index 00f92d6..4970310 100644 --- a/content/browser/android/media_resource_getter_impl.cc +++ b/content/browser/android/media_resource_getter_impl.cc @@ -15,12 +15,12 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" -#include "googleurl/src/gurl.h" #include "jni/MediaResourceGetter_jni.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h index 52f30da..35e5526 100644 --- a/content/browser/android/web_contents_observer_android.h +++ b/content/browser/android/web_contents_observer_android.h @@ -9,10 +9,10 @@ #include "base/android/jni_helper.h" #include "base/basictypes.h" +#include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/frame_navigate_params.h" -#include "content/browser/web_contents/web_contents_impl.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc index 32c1b5e58..56efe6b 100644 --- a/content/browser/browser_url_handler_impl.cc +++ b/content/browser/browser_url_handler_impl.cc @@ -8,7 +8,7 @@ #include "content/browser/webui/web_ui_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/browser_url_handler_impl_unittest.cc b/content/browser/browser_url_handler_impl_unittest.cc index 9759178..4e8dc21 100644 --- a/content/browser/browser_url_handler_impl_unittest.cc +++ b/content/browser/browser_url_handler_impl_unittest.cc @@ -4,8 +4,8 @@ #include "content/browser/browser_url_handler_impl.h" #include "content/public/test/test_browser_context.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index 3ddd5d5..c99ed07 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -17,9 +17,9 @@ #include "content/public/common/bindings_policy.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" #include "webkit/browser/fileapi/file_permission_policy.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/isolated_context.h" diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index 4d0dc9d..55750bf 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -11,8 +11,8 @@ #include "content/browser/child_process_security_policy_impl.h" #include "content/public/common/url_constants.h" #include "content/test/test_content_browser_client.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { namespace { diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index cc07f0a..694f528 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -38,13 +38,13 @@ #include "content/public/browser/render_view_host.h" #include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/devtools_resources_map.h" #include "net/base/escape.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/server/http_server_request_info.h" #include "ui/base/layout.h" +#include "url/gurl.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/user_agent/user_agent_util.h" diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc index fa10624..b5c327b 100644 --- a/content/browser/devtools/renderer_overrides_handler.cc +++ b/content/browser/devtools/renderer_overrides_handler.cc @@ -25,8 +25,8 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" #include "ui/snapshot/snapshot.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/dom_storage/dom_storage_message_filter.cc b/content/browser/dom_storage/dom_storage_message_filter.cc index 537300e..8649ebe 100644 --- a/content/browser/dom_storage/dom_storage_message_filter.cc +++ b/content/browser/dom_storage/dom_storage_message_filter.cc @@ -12,7 +12,7 @@ #include "content/browser/dom_storage/dom_storage_context_impl.h" #include "content/common/dom_storage_messages.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/browser/dom_storage/dom_storage_area.h" #include "webkit/browser/dom_storage/dom_storage_host.h" #include "webkit/browser/dom_storage/dom_storage_task_runner.h" diff --git a/content/browser/download/base_file.h b/content/browser/download/base_file.h index 7b42669..9c1261c 100644 --- a/content/browser/download/base_file.h +++ b/content/browser/download/base_file.h @@ -14,10 +14,10 @@ #include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/download_interrupt_reasons.h" -#include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" +#include "url/gurl.h" namespace crypto { class SecureHash; diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index bc256ce..2cc7cfd 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -28,10 +28,10 @@ #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "content/test/net/url_request_slow_download_job.h" -#include "googleurl/src/gurl.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using ::testing::_; using ::testing::AllOf; diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h index e602128..bc0897e 100644 --- a/content/browser/download/download_create_info.h +++ b/content/browser/download/download_create_info.h @@ -17,8 +17,8 @@ #include "content/public/browser/download_id.h" #include "content/public/browser/download_save_info.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "net/base/net_log.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/download/download_file_factory.h b/content/browser/download/download_file_factory.h index dc260ca..2600e3f 100644 --- a/content/browser/download/download_file_factory.h +++ b/content/browser/download/download_file_factory.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { class BoundNetLog; diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h index dc796d2..974d727 100644 --- a/content/browser/download/download_item_impl.h +++ b/content/browser/download/download_item_impl.h @@ -21,9 +21,9 @@ #include "content/public/browser/download_destination_observer.h" #include "content/public/browser/download_id.h" #include "content/public/browser/download_item.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" +#include "url/gurl.h" namespace content { class DownloadFile; diff --git a/content/browser/download/download_net_log_parameters.cc b/content/browser/download/download_net_log_parameters.cc index 4c204fe..0485cf2 100644 --- a/content/browser/download/download_net_log_parameters.cc +++ b/content/browser/download/download_net_log_parameters.cc @@ -10,8 +10,8 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "content/public/browser/download_interrupt_reasons.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/download/drag_download_file.h b/content/browser/download/drag_download_file.h index 2151d44..ec1857e 100644 --- a/content/browser/download/drag_download_file.h +++ b/content/browser/download/drag_download_file.h @@ -16,10 +16,10 @@ #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "ui/base/dragdrop/download_file_interface.h" #include "ui/base/ui_export.h" +#include "url/gurl.h" namespace net { class FileStream; diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc index e5de5df..fc35d6c 100644 --- a/content/browser/download/drag_download_file_browsertest.cc +++ b/content/browser/download/drag_download_file_browsertest.cc @@ -23,9 +23,9 @@ #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "content/test/net/url_request_slow_download_job.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using testing::_; using testing::InvokeWithoutArgs; diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index 962023a..a5ff841 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc @@ -15,9 +15,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" +#include "url/gurl.h" using net::FileStream; diff --git a/content/browser/download/file_metadata_linux.cc b/content/browser/download/file_metadata_linux.cc index 73f66d7..894acb8 100644 --- a/content/browser/download/file_metadata_linux.cc +++ b/content/browser/download/file_metadata_linux.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/download/file_metadata_mac.mm b/content/browser/download/file_metadata_mac.mm index 1bdec1f..fc0556e 100644 --- a/content/browser/download/file_metadata_mac.mm +++ b/content/browser/download/file_metadata_mac.mm @@ -12,7 +12,7 @@ #include "base/mac/mac_logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/download/file_metadata_unittest_linux.cc b/content/browser/download/file_metadata_unittest_linux.cc index 504f130..bc8666e 100644 --- a/content/browser/download/file_metadata_unittest_linux.cc +++ b/content/browser/download/file_metadata_unittest_linux.cc @@ -16,8 +16,8 @@ #include "base/logging.h" #include "base/strings/string_split.h" #include "content/browser/download/file_metadata_linux.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { namespace { diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 3abcd83..36ba5a1 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -18,9 +18,9 @@ #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_util.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/download/save_file_resource_handler.h b/content/browser/download/save_file_resource_handler.h index 7647013..8dad4f8 100644 --- a/content/browser/download/save_file_resource_handler.h +++ b/content/browser/download/save_file_resource_handler.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "content/browser/loader/resource_handler.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class SaveFileManager; diff --git a/content/browser/download/save_item.h b/content/browser/download/save_item.h index 106126f..d7cbb4f 100644 --- a/content/browser/download/save_item.h +++ b/content/browser/download/save_item.h @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "content/browser/download/save_types.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class SavePackage; diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h index 7510883..2d50666 100644 --- a/content/browser/download/save_package.h +++ b/content/browser/download/save_package.h @@ -23,7 +23,7 @@ #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class GURL; diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index 5cda635..9c8f29f 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -13,8 +13,8 @@ #include "content/browser/renderer_host/test_render_view_host.h" #include "content/test/net/url_request_mock_http_job.h" #include "content/test/test_web_contents.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/download/save_types.h b/content/browser/download/save_types.h index 5f60e1e..dcdebb4 100644 --- a/content/browser/download/save_types.h +++ b/content/browser/download/save_types.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { typedef std::vector<std::pair<int, base::FilePath> > FinalNameList; diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 5d1db3b..63a50a1 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -20,11 +20,11 @@ #include "content/common/fileapi/file_system_messages.h" #include "content/common/fileapi/webblob_messages.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_platform_file.h" #include "net/base/mime_util.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "url/gurl.h" #include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/browser/fileapi/file_observers.h" #include "webkit/browser/fileapi/file_permission_policy.h" diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc index 2796315..45bdfdb 100644 --- a/content/browser/geolocation/location_arbitrator_impl.cc +++ b/content/browser/geolocation/location_arbitrator_impl.cc @@ -12,7 +12,7 @@ #include "content/public/browser/access_token_store.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { namespace { diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h index 4fc564a..36e843b 100644 --- a/content/browser/geolocation/network_location_request.h +++ b/content/browser/geolocation/network_location_request.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "content/browser/geolocation/device_data_provider.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" +#include "url/gurl.h" namespace net { class URLFetcher; diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc index 7253954..103d122 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc @@ -10,9 +10,9 @@ #include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/common/gpu_feature_type.h" #include "content/public/common/gpu_info.h" -#include "googleurl/src/gurl.h" #include "gpu/command_buffer/service/gpu_switches.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" #define LONG_STRING_CONST(...) #__VA_ARGS__ diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index e835d02..7b2f6a8 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h @@ -21,13 +21,13 @@ #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/public/browser/browser_child_process_host_delegate.h" #include "content/public/browser/gpu_data_manager.h" -#include "googleurl/src/gurl.h" #include "gpu/command_buffer/common/constants.h" #include "gpu/config/gpu_info.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sender.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "url/gurl.h" struct GPUCreateCommandBufferConfig; struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; diff --git a/content/browser/histogram_internals_request_job.cc b/content/browser/histogram_internals_request_job.cc index 69f35dd..dc387bf 100644 --- a/content/browser/histogram_internals_request_job.cc +++ b/content/browser/histogram_internals_request_job.cc @@ -7,10 +7,10 @@ #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "content/browser/histogram_synchronizer.h" -#include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index 2a49de4f..721251b 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc @@ -11,8 +11,8 @@ #include "base/strings/utf_string_conversions.h" #include "content/browser/indexed_db/indexed_db_factory.h" #include "content/browser/indexed_db/indexed_db_leveldb_coding.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" #include "webkit/common/database/database_identifier.h" using WebKit::WebIDBKey; diff --git a/content/browser/indexed_db/indexed_db_callbacks.h b/content/browser/indexed_db/indexed_db_callbacks.h index b324159..b40efa0 100644 --- a/content/browser/indexed_db/indexed_db_callbacks.h +++ b/content/browser/indexed_db/indexed_db_callbacks.h @@ -17,8 +17,8 @@ #include "content/browser/indexed_db/indexed_db_dispatcher_host.h" #include "content/common/indexed_db/indexed_db_key.h" #include "content/common/indexed_db/indexed_db_key_path.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebIDBCallbacks.h" +#include "url/gurl.h" namespace content { class IndexedDBConnection; diff --git a/content/browser/indexed_db/indexed_db_context_impl.h b/content/browser/indexed_db/indexed_db_context_impl.h index d13da25..d1ecff8 100644 --- a/content/browser/indexed_db/indexed_db_context_impl.h +++ b/content/browser/indexed_db/indexed_db_context_impl.h @@ -16,7 +16,7 @@ #include "content/browser/browser_main_loop.h" #include "content/browser/indexed_db/indexed_db_factory.h" #include "content/public/browser/indexed_db_context.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/common/quota/quota_types.h" class GURL; diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc index ee7070b..9a39add 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc @@ -24,8 +24,8 @@ #include "content/public/browser/user_metrics.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h" +#include "url/gurl.h" #include "webkit/browser/database/database_util.h" #include "webkit/common/database/database_identifier.h" diff --git a/content/browser/loader/async_resource_handler.h b/content/browser/loader/async_resource_handler.h index 0a690b0..5f36112 100644 --- a/content/browser/loader/async_resource_handler.h +++ b/content/browser/loader/async_resource_handler.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "content/browser/loader/resource_handler.h" #include "content/browser/loader/resource_message_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { class URLRequest; diff --git a/content/browser/loader/certificate_resource_handler.h b/content/browser/loader/certificate_resource_handler.h index 428063a..b1bd8f4 100644 --- a/content/browser/loader/certificate_resource_handler.h +++ b/content/browser/loader/certificate_resource_handler.h @@ -13,8 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/browser/loader/resource_handler.h" -#include "googleurl/src/gurl.h" #include "net/base/mime_util.h" +#include "url/gurl.h" namespace net { class IOBuffer; diff --git a/content/browser/loader/stream_resource_handler.h b/content/browser/loader/stream_resource_handler.h index 0f18f01..ce540578 100644 --- a/content/browser/loader/stream_resource_handler.h +++ b/content/browser/loader/stream_resource_handler.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "content/browser/loader/resource_handler.h" #include "content/browser/streams/stream_write_observer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { class URLRequest; diff --git a/content/browser/loader/throttling_resource_handler.h b/content/browser/loader/throttling_resource_handler.h index de125b5..2661cdd 100644 --- a/content/browser/loader/throttling_resource_handler.h +++ b/content/browser/loader/throttling_resource_handler.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_vector.h" #include "content/browser/loader/layered_resource_handler.h" #include "content/public/browser/resource_controller.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc index 2aa7bb8..b890ebc 100644 --- a/content/browser/loader/upload_data_stream_builder_unittest.cc +++ b/content/browser/loader/upload_data_stream_builder_unittest.cc @@ -11,11 +11,11 @@ #include "base/message_loop.h" #include "base/message_loop/message_loop_proxy.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" #include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/common/resource_request_body.h" diff --git a/content/browser/media/webrtc_identity_store.cc b/content/browser/media/webrtc_identity_store.cc index 17827cb..ee19f1e 100644 --- a/content/browser/media/webrtc_identity_store.cc +++ b/content/browser/media/webrtc_identity_store.cc @@ -11,9 +11,9 @@ #include "base/threading/worker_pool.h" #include "content/public/browser/browser_thread.h" #include "crypto/rsa_private_key.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/cert/x509_util.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/media/webrtc_identity_store_unittest.cc b/content/browser/media/webrtc_identity_store_unittest.cc index f8cd6c7..a975dd4 100644 --- a/content/browser/media/webrtc_identity_store_unittest.cc +++ b/content/browser/media/webrtc_identity_store_unittest.cc @@ -8,9 +8,9 @@ #include "content/browser/media/webrtc_identity_store.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc index d74e60d..fe7a147 100644 --- a/content/browser/net/sqlite_persistent_cookie_store.cc +++ b/content/browser/net/sqlite_persistent_cookie_store.cc @@ -28,7 +28,6 @@ #include "base/time/time.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/cookie_store_factory.h" -#include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" @@ -38,6 +37,7 @@ #include "sql/statement.h" #include "sql/transaction.h" #include "third_party/sqlite/sqlite3.h" +#include "url/gurl.h" #include "webkit/browser/quota/special_storage_policy.h" using base::Time; diff --git a/content/browser/net/sqlite_persistent_cookie_store_perftest.cc b/content/browser/net/sqlite_persistent_cookie_store_perftest.cc index 89d33e5..4f62706 100644 --- a/content/browser/net/sqlite_persistent_cookie_store_perftest.cc +++ b/content/browser/net/sqlite_persistent_cookie_store_perftest.cc @@ -13,10 +13,10 @@ #include "base/synchronization/waitable_event.h" #include "base/test/sequenced_worker_pool_owner.h" #include "base/threading/sequenced_worker_pool.h" -#include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/net/sqlite_persistent_cookie_store_unittest.cc b/content/browser/net/sqlite_persistent_cookie_store_unittest.cc index b3abee7..2d01478 100644 --- a/content/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/content/browser/net/sqlite_persistent_cookie_store_unittest.cc @@ -19,12 +19,12 @@ #include "base/test/sequenced_worker_pool_owner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" #include "sql/connection.h" #include "sql/meta_table.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 1079a1f..3349672 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -24,8 +24,8 @@ #include "content/browser/ppapi_plugin_process_host.h" #include "content/common/content_export.h" #include "content/public/browser/plugin_service.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_channel_handle.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "base/memory/scoped_ptr.h" diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc index 6935aba..1d4a851 100644 --- a/content/browser/renderer_host/clipboard_message_filter.cc +++ b/content/browser/renderer_host/clipboard_message_filter.cc @@ -9,12 +9,12 @@ #include "base/stl_util.h" #include "content/common/clipboard_messages.h" #include "content/public/browser/browser_context.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/zlib/zlib.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/size.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc index 1343666..abd4cd3 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc @@ -8,7 +8,7 @@ #include "content/browser/renderer_host/media/web_contents_capture_util.h" #include "content/common/media/media_stream_messages.h" #include "content/common/media/media_stream_options.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index 981d6bc..3547f3b 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc @@ -23,10 +23,10 @@ #include "content/public/browser/media_request_state.h" #include "content/public/common/content_switches.h" #include "content/public/common/media_stream_request.h" -#include "googleurl/src/gurl.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h index 63e733f..61db917 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h @@ -7,10 +7,10 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "googleurl/src/gurl.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/host/host_message_context.h" #include "ppapi/host/resource_host.h" +#include "url/gurl.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/common/fileapi/file_system_types.h" diff --git a/content/browser/renderer_host/quota_dispatcher_host.cc b/content/browser/renderer_host/quota_dispatcher_host.cc index 4bc3875..b634820 100644 --- a/content/browser/renderer_host/quota_dispatcher_host.cc +++ b/content/browser/renderer_host/quota_dispatcher_host.cc @@ -8,8 +8,8 @@ #include "base/memory/weak_ptr.h" #include "content/common/quota_messages.h" #include "content/public/browser/quota_permission_context.h" -#include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "url/gurl.h" #include "webkit/browser/quota/quota_manager.h" using quota::QuotaClient; diff --git a/content/browser/renderer_host/render_view_host_delegate.cc b/content/browser/renderer_host/render_view_host_delegate.cc index 0df7186..f340a46 100644 --- a/content/browser/renderer_host/render_view_host_delegate.cc +++ b/content/browser/renderer_host/render_view_host_delegate.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/common/webpreferences.h" namespace content { diff --git a/content/browser/resolve_proxy_msg_helper.h b/content/browser/resolve_proxy_msg_helper.h index 8dd45eb..a55e669 100644 --- a/content/browser/resolve_proxy_msg_helper.h +++ b/content/browser/resolve_proxy_msg_helper.h @@ -11,9 +11,9 @@ #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/proxy/proxy_service.h" +#include "url/gurl.h" namespace net { class URLRequestContextGetter; diff --git a/content/browser/safe_util_win.cc b/content/browser/safe_util_win.cc index 71afa13..2dce2ca 100644 --- a/content/browser/safe_util_win.cc +++ b/content/browser/safe_util_win.cc @@ -13,8 +13,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_comptr.h" -#include "googleurl/src/gurl.h" #include "ui/base/win/shell.h" +#include "url/gurl.h" namespace content { namespace { diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h index bd5f9c8..b195d09 100644 --- a/content/browser/site_instance_impl.h +++ b/content/browser/site_instance_impl.h @@ -10,7 +10,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/site_instance.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class RenderProcessHostFactory; diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index c8c676e..d61c70b 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -26,8 +26,8 @@ #include "content/public/test/test_browser_thread.h" #include "content/test/test_content_browser_client.h" #include "content/test/test_content_client.h" -#include "googleurl/src/url_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/url_util.h" namespace content { namespace { diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h index aa301ae..e7345e2 100644 --- a/content/browser/ssl/ssl_error_handler.h +++ b/content/browser/ssl/ssl_error_handler.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/glue/resource_type.h" namespace net { diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h index 0ccedb2..6c80edd 100644 --- a/content/browser/ssl/ssl_manager.h +++ b/content/browser/ssl/ssl_manager.h @@ -10,15 +10,15 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "content/browser/ssl/ssl_policy_backend.h" #include "content/browser/ssl/ssl_error_handler.h" +#include "content/browser/ssl/ssl_policy_backend.h" #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" -#include "net/cert/cert_status_flags.h" #include "net/base/net_errors.h" +#include "net/cert/cert_status_flags.h" +#include "url/gurl.h" namespace net { class SSLInfo; diff --git a/content/browser/ssl/ssl_request_info.h b/content/browser/ssl/ssl_request_info.h index d5971ed..7f27b4b 100644 --- a/content/browser/ssl/ssl_request_info.h +++ b/content/browser/ssl/ssl_request_info.h @@ -8,8 +8,8 @@ #include <string> #include "base/memory/ref_counted.h" -#include "googleurl/src/gurl.h" #include "net/cert/cert_status_flags.h" +#include "url/gurl.h" #include "webkit/glue/resource_type.h" namespace content { diff --git a/content/browser/streams/stream.h b/content/browser/streams/stream.h index 3823262..912e437 100644 --- a/content/browser/streams/stream.h +++ b/content/browser/streams/stream.h @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "content/browser/byte_stream.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { class IOBuffer; diff --git a/content/browser/streams/stream_registry.h b/content/browser/streams/stream_registry.h index eaab7ef..e75c97c 100644 --- a/content/browser/streams/stream_registry.h +++ b/content/browser/streams/stream_registry.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/web_contents/debug_urls.cc b/content/browser/web_contents/debug_urls.cc index d11e2f5..b554eca 100644 --- a/content/browser/web_contents/debug_urls.cc +++ b/content/browser/web_contents/debug_urls.cc @@ -11,8 +11,8 @@ #include "content/browser/ppapi_plugin_process_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "ppapi/proxy/ppapi_messages.h" +#include "url/gurl.h" #include "webkit/plugins/plugin_constants.h" namespace content { diff --git a/content/browser/web_contents/frame_tree_node.h b/content/browser/web_contents/frame_tree_node.h index 5bd3f1b..38a0032 100644 --- a/content/browser/web_contents/frame_tree_node.h +++ b/content/browser/web_contents/frame_tree_node.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/web_contents/interstitial_page_impl.h b/content/browser/web_contents/interstitial_page_impl.h index bfb1e22..be4bd8c 100644 --- a/content/browser/web_contents/interstitial_page_impl.h +++ b/content/browser/web_contents/interstitial_page_impl.h @@ -16,7 +16,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/renderer_preferences.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class NavigationEntry; diff --git a/content/browser/web_contents/web_drag_dest_win.cc b/content/browser/web_contents/web_drag_dest_win.cc index af0e724..60f0c05 100644 --- a/content/browser/web_contents/web_drag_dest_win.cc +++ b/content/browser/web_contents/web_drag_dest_win.cc @@ -14,7 +14,6 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_drag_dest_delegate.h" #include "content/public/common/drop_data.h" -#include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/clipboard/clipboard_util_win.h" @@ -22,6 +21,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/point.h" +#include "url/gurl.h" using WebKit::WebDragOperationNone; using WebKit::WebDragOperationCopy; diff --git a/content/browser/web_contents/web_drag_source_gtk.h b/content/browser/web_contents/web_drag_source_gtk.h index f7954cd..eef8d73 100644 --- a/content/browser/web_contents/web_drag_source_gtk.h +++ b/content/browser/web_contents/web_drag_source_gtk.h @@ -13,12 +13,12 @@ #include "base/strings/string16.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/vector2d.h" +#include "url/gurl.h" class SkBitmap; diff --git a/content/browser/web_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h index 0c9b951..4b18953 100644 --- a/content/browser/web_contents/web_drag_source_mac.h +++ b/content/browser/web_contents/web_drag_source_mac.h @@ -9,7 +9,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class WebContentsImpl; diff --git a/content/browser/web_contents/web_drag_source_mac_unittest.mm b/content/browser/web_contents/web_drag_source_mac_unittest.mm index 7b21080..1b58319 100644 --- a/content/browser/web_contents/web_drag_source_mac_unittest.mm +++ b/content/browser/web_contents/web_drag_source_mac_unittest.mm @@ -7,8 +7,8 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/drop_data.h" #include "content/public/test/test_renderer_host.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index 1604584..fed6e6a 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -30,7 +30,6 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_request_info.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/url_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" @@ -39,6 +38,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_factory.h" +#include "url/url_util.h" #include "webkit/browser/appcache/view_appcache_internals_job.h" using appcache::AppCacheService; diff --git a/content/browser/webui/web_ui_controller_factory_registry.cc b/content/browser/webui/web_ui_controller_factory_registry.cc index 32220ac..675bd8f 100644 --- a/content/browser/webui/web_ui_controller_factory_registry.cc +++ b/content/browser/webui/web_ui_controller_factory_registry.cc @@ -6,7 +6,7 @@ #include "base/lazy_instance.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index 8adbec2..ca87c5d0 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -22,9 +22,9 @@ #include "content/shell/shell_resource_dispatcher_host_delegate.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/base/test_data_directory.h" #include "net/test/spawned_test_server/spawned_test_server.h" +#include "url/gurl.h" namespace content { diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h index acc6359..226d345 100644 --- a/content/browser/worker_host/worker_process_host.h +++ b/content/browser/worker_host/worker_process_host.h @@ -18,8 +18,8 @@ #include "content/public/browser/browser_child_process_host_delegate.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/common/process_type.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_sender.h" +#include "url/gurl.h" namespace fileapi { class FileSystemContext; diff --git a/content/child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc index c1b610c..a6e7187 100644 --- a/content/child/fileapi/webfilesystem_callback_adapters.cc +++ b/content/child/fileapi/webfilesystem_callback_adapters.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "googleurl/src/gurl.h" -#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" #include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" +#include "url/gurl.h" #include "webkit/common/fileapi/directory_entry.h" #include "webkit/common/fileapi/file_system_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/child/npobject_proxy.h b/content/child/npobject_proxy.h index ad16210..137c090 100644 --- a/content/child/npobject_proxy.h +++ b/content/child/npobject_proxy.h @@ -10,11 +10,11 @@ #include "base/memory/ref_counted.h" #include "content/child/npobject_base.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "third_party/npapi/bindings/npruntime.h" #include "ui/gfx/native_widget_types.h" +#include "url/gurl.h" struct NPObject; diff --git a/content/child/npobject_stub.h b/content/child/npobject_stub.h index 70d3fbd..a8da2bf 100644 --- a/content/child/npobject_stub.h +++ b/content/child/npobject_stub.h @@ -13,9 +13,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/child/npobject_base.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" +#include "url/gurl.h" struct NPObject; diff --git a/content/child/quota_dispatcher.cc b/content/child/quota_dispatcher.cc index 79f0f5e..69bec35 100644 --- a/content/child/quota_dispatcher.cc +++ b/content/child/quota_dispatcher.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "content/child/child_thread.h" #include "content/common/quota_messages.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebStorageQuotaCallbacks.h" #include "third_party/WebKit/public/web/WebStorageQuotaType.h" +#include "url/gurl.h" using quota::QuotaStatusCode; using quota::StorageType; diff --git a/content/child/socket_stream_dispatcher.cc b/content/child/socket_stream_dispatcher.cc index c533cba..cd9a625 100644 --- a/content/child/socket_stream_dispatcher.cc +++ b/content/child/socket_stream_dispatcher.cc @@ -17,8 +17,8 @@ #include "content/common/socket_stream.h" #include "content/common/socket_stream_handle_data.h" #include "content/common/socket_stream_messages.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" +#include "url/gurl.h" #include "webkit/glue/websocketstreamhandle_bridge.h" #include "webkit/glue/websocketstreamhandle_delegate.h" 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_ diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h index 7bdfd8b..370ff97 100644 --- a/content/plugin/webplugin_delegate_stub.h +++ b/content/plugin/webplugin_delegate_stub.h @@ -10,12 +10,12 @@ #include "base/memory/ref_counted.h" #include "content/child/npobject_stub.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "third_party/npapi/bindings/npapi.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" struct PluginMsg_Init_Params; struct PluginMsg_DidReceiveResponseParams; diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 43e8a74..5b53eaa 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -17,10 +17,10 @@ #include "base/memory/weak_ptr.h" #include "base/shared_memory.h" #include "base/timer/timer.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "url/gurl.h" #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif diff --git a/content/public/browser/access_token_store.h b/content/public/browser/access_token_store.h index cd2549f..0af3fe7 100644 --- a/content/public/browser/access_token_store.h +++ b/content/public/browser/access_token_store.h @@ -19,7 +19,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class GURL; diff --git a/content/public/browser/browser_ppapi_host.h b/content/public/browser/browser_ppapi_host.h index dbf09bb..47edee7 100644 --- a/content/public/browser/browser_ppapi_host.h +++ b/content/public/browser/browser_ppapi_host.h @@ -9,8 +9,8 @@ #include "base/process.h" #include "content/common/content_export.h" #include "content/public/browser/render_view_host.h" -#include "googleurl/src/gurl.h" #include "ppapi/c/pp_instance.h" +#include "url/gurl.h" namespace IPC { class ChannelProxy; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 367eede..3d1ef4e 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -5,8 +5,8 @@ #include "content/public/browser/content_browser_client.h" #include "base/files/file_path.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/image/image_skia.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/download_url_parameters.cc b/content/public/browser/download_url_parameters.cc index 6fd51c1..d604a4d 100644 --- a/content/public/browser/download_url_parameters.cc +++ b/content/public/browser/download_url_parameters.cc @@ -10,7 +10,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/download_url_parameters.h b/content/public/browser/download_url_parameters.h index 0b72931..a907f09 100644 --- a/content/public/browser/download_url_parameters.h +++ b/content/public/browser/download_url_parameters.h @@ -12,8 +12,8 @@ #include "base/callback.h" #include "content/public/browser/download_save_info.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/favicon_status.h b/content/public/browser/favicon_status.h index cfa4773..7bd9328 100644 --- a/content/public/browser/favicon_status.h +++ b/content/public/browser/favicon_status.h @@ -6,8 +6,8 @@ #define CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/image/image.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/indexed_db_info.h b/content/public/browser/indexed_db_info.h index 3572993..02d4ed8 100644 --- a/content/public/browser/indexed_db_info.h +++ b/content/public/browser/indexed_db_info.h @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/time/time.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/javascript_dialog_manager.h b/content/public/browser/javascript_dialog_manager.h index fd1db76..e392b39 100644 --- a/content/public/browser/javascript_dialog_manager.h +++ b/content/public/browser/javascript_dialog_manager.h @@ -11,8 +11,8 @@ #include "base/strings/string16.h" #include "content/common/content_export.h" #include "content/public/common/javascript_message_type.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/load_from_memory_cache_details.h b/content/public/browser/load_from_memory_cache_details.h index 1ebf491..b826fe7 100644 --- a/content/public/browser/load_from_memory_cache_details.h +++ b/content/public/browser/load_from_memory_cache_details.h @@ -7,8 +7,8 @@ #include <string> #include "base/basictypes.h" -#include "googleurl/src/gurl.h" #include "net/cert/cert_status_flags.h" +#include "url/gurl.h" #include "webkit/glue/resource_type.h" namespace content { diff --git a/content/public/browser/load_notification_details.h b/content/public/browser/load_notification_details.h index 43c736c..70efdd8 100644 --- a/content/public/browser/load_notification_details.h +++ b/content/public/browser/load_notification_details.h @@ -8,7 +8,7 @@ #include "base/time/time.h" #include "content/public/browser/navigation_controller.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h index e846214..03b8b1c 100644 --- a/content/public/browser/navigation_controller.h +++ b/content/public/browser/navigation_controller.h @@ -15,7 +15,7 @@ #include "content/public/browser/global_request_id.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { diff --git a/content/public/browser/navigation_details.h b/content/public/browser/navigation_details.h index cb55de2..5a01aec 100644 --- a/content/public/browser/navigation_details.h +++ b/content/public/browser/navigation_details.h @@ -8,7 +8,7 @@ #include <string> #include "content/common/content_export.h" #include "content/public/browser/navigation_type.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/page_navigator.h b/content/public/browser/page_navigator.h index 587c665..338d5a8 100644 --- a/content/public/browser/page_navigator.h +++ b/content/public/browser/page_navigator.h @@ -15,8 +15,8 @@ #include "content/public/browser/global_request_id.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/resource_request_details.h b/content/public/browser/resource_request_details.h index 4e94418..66c0eaf 100644 --- a/content/public/browser/resource_request_details.h +++ b/content/public/browser/resource_request_details.h @@ -7,10 +7,10 @@ #include <string> -#include "googleurl/src/gurl.h" -#include "net/cert/cert_status_flags.h" #include "net/base/host_port_pair.h" +#include "net/cert/cert_status_flags.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" #include "webkit/glue/resource_type.h" namespace net { diff --git a/content/public/browser/site_instance.h b/content/public/browser/site_instance.h index 0696fdc..3755e8f 100644 --- a/content/public/browser/site_instance.h +++ b/content/public/browser/site_instance.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class BrowserContext; diff --git a/content/public/browser/stream_handle.h b/content/public/browser/stream_handle.h index 621b777..5965a40 100644 --- a/content/public/browser/stream_handle.h +++ b/content/public/browser/stream_handle.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/browser/worker_service.h b/content/public/browser/worker_service.h index 2579f96..0b066e3 100644 --- a/content/public/browser/worker_service.h +++ b/content/public/browser/worker_service.h @@ -9,7 +9,7 @@ #include "base/process.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h index b8ae736..b3f66f5 100644 --- a/content/public/common/common_param_traits.h +++ b/content/public/common/common_param_traits.h @@ -17,10 +17,10 @@ #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/public/common/common_param_traits_macros.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_message_utils.h" #include "ui/gfx/native_widget_types.h" #include "ui/surface/transport_dib.h" +#include "url/gurl.h" class SkBitmap; diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h index 5940c37..e962530 100644 --- a/content/public/common/context_menu_params.h +++ b/content/public/common/context_menu_params.h @@ -12,10 +12,10 @@ #include "content/common/content_export.h" #include "content/public/common/page_state.h" #include "content/public/common/ssl_status.h" -#include "googleurl/src/gurl.h" -#include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "third_party/WebKit/public/web/WebContextMenuData.h" #include "ui/base/ui_base_types.h" +#include "url/gurl.h" #include "webkit/common/webmenuitem.h" #if defined(OS_ANDROID) diff --git a/content/public/common/favicon_url.h b/content/public/common/favicon_url.h index 1e0bc4d..189d442 100644 --- a/content/public/common/favicon_url.h +++ b/content/public/common/favicon_url.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_COMMON_FAVICON_URL_ #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/frame_navigate_params.h b/content/public/common/frame_navigate_params.h index f3f686c..0625175 100644 --- a/content/public/common/frame_navigate_params.h +++ b/content/public/common/frame_navigate_params.h @@ -12,8 +12,8 @@ #include "content/public/common/page_transition_types.h" #include "content/public/common/password_form.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h index 74446e0..bdbc288a 100644 --- a/content/public/common/media_stream_request.h +++ b/content/public/common/media_stream_request.h @@ -13,7 +13,7 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/password_form.h b/content/public/common/password_form.h index ac52f22..fff2e60 100644 --- a/content/public/common/password_form.h +++ b/content/public/common/password_form.h @@ -11,7 +11,7 @@ #include "base/time/time.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/referrer.h b/content/public/common/referrer.h index 48c6f51..c30f4b8 100644 --- a/content/public/common/referrer.h +++ b/content/public/common/referrer.h @@ -6,8 +6,8 @@ #define CONTENT_PUBLIC_COMMON_REFERRER_H_ #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/resource_response.h b/content/public/common/resource_response.h index cbda885..6e7cec2 100644 --- a/content/public/common/resource_response.h +++ b/content/public/common/resource_response.h @@ -12,8 +12,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" #include "webkit/glue/resource_loader_bridge.h" namespace content { diff --git a/content/public/common/show_desktop_notification_params.h b/content/public/common/show_desktop_notification_params.h index 02debd3..ef129cc 100644 --- a/content/public/common/show_desktop_notification_params.h +++ b/content/public/common/show_desktop_notification_params.h @@ -6,8 +6,8 @@ #define CONTENT_PUBLIC_COMMON_SHOW_DESKTOP_NOTIFICATION_PARAMS_H_ #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebTextDirection.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/common/url_utils.cc b/content/public/common/url_utils.cc index e12a18b..2f08b96 100644 --- a/content/public/common/url_utils.cc +++ b/content/public/common/url_utils.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "content/common/savable_url_schemes.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h index c728e89..83f3985 100644 --- a/content/public/test/browser_test_utils.h +++ b/content/public/test/browser_test_utils.h @@ -17,9 +17,9 @@ #include "base/strings/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "base/win/scoped_handle.h" diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h index d5e6339..bac0739 100644 --- a/content/public/test/mock_download_item.h +++ b/content/public/test/mock_download_item.h @@ -10,9 +10,9 @@ #include "content/public/browser/download_id.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h index f7f5da7..4257fe5 100644 --- a/content/public/test/mock_download_manager.h +++ b/content/public/test/mock_download_manager.h @@ -10,9 +10,9 @@ #include "content/public/browser/download_manager.h" #include "content/public/browser/download_save_info.h" #include "content/public/browser/download_url_parameters.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" class DownloadRequestHandle; diff --git a/content/public/test/render_view_fake_resources_test.cc b/content/public/test/render_view_fake_resources_test.cc index 5456add..8e9e6b2 100644 --- a/content/public/test/render_view_fake_resources_test.cc +++ b/content/public/test/render_view_fake_resources_test.cc @@ -19,7 +19,6 @@ #include "content/renderer/render_view_impl.h" #include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "content/test/mock_render_process.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/upload_data.h" #include "net/http/http_response_headers.h" @@ -30,6 +29,7 @@ #include "third_party/WebKit/public/web/WebHistoryItem.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/base/ui_base_switches.h" +#include "url/gurl.h" #include "webkit/common/dom_storage/dom_storage_types.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/public/test/test_file_error_injector.cc b/content/public/test/test_file_error_injector.cc index 1d91ea6db..04e9acc 100644 --- a/content/public/test/test_file_error_injector.cc +++ b/content/public/test/test_file_error_injector.cc @@ -15,7 +15,7 @@ #include "content/browser/loader/resource_dispatcher_host_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/power_save_blocker.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class ByteStreamReader; diff --git a/content/renderer/android/address_detector.h b/content/renderer/android/address_detector.h index 2d57c0f..2619503 100644 --- a/content/renderer/android/address_detector.h +++ b/content/renderer/android/address_detector.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "content/renderer/android/content_detector.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/android/content_detector.h b/content/renderer/android/content_detector.h index 8a06ee7..d17a585 100644 --- a/content/renderer/android/content_detector.h +++ b/content/renderer/android/content_detector.h @@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_ #define CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_ -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebRange.h" +#include "url/gurl.h" namespace WebKit { class WebHitTestResult; diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.cc b/content/renderer/dom_storage/webstoragenamespace_impl.cc index c755cb0..de2b6c5 100644 --- a/content/renderer/dom_storage/webstoragenamespace_impl.cc +++ b/content/renderer/dom_storage/webstoragenamespace_impl.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "content/renderer/dom_storage/webstoragearea_impl.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebString.h" +#include "url/gurl.h" #include "webkit/common/dom_storage/dom_storage_types.h" using WebKit::WebStorageArea; diff --git a/content/renderer/fetchers/alt_error_page_resource_fetcher.h b/content/renderer/fetchers/alt_error_page_resource_fetcher.h index 4ad1bda..6d82857 100644 --- a/content/renderer/fetchers/alt_error_page_resource_fetcher.h +++ b/content/renderer/fetchers/alt_error_page_resource_fetcher.h @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "url/gurl.h" namespace WebKit { class WebFrame; diff --git a/content/renderer/fetchers/resource_fetcher.h b/content/renderer/fetchers/resource_fetcher.h index 13ef741..5900973 100644 --- a/content/renderer/fetchers/resource_fetcher.h +++ b/content/renderer/fetchers/resource_fetcher.h @@ -20,10 +20,10 @@ #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" +#include "url/gurl.h" class GURL; diff --git a/content/renderer/image_loading_helper.h b/content/renderer/image_loading_helper.h index bd87d93..94c04f9 100644 --- a/content/renderer/image_loading_helper.h +++ b/content/renderer/image_loading_helper.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_vector.h" #include "content/public/renderer/render_view_observer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class SkBitmap; diff --git a/content/renderer/internal_document_state_data.h b/content/renderer/internal_document_state_data.h index ff6c429..9fba893 100644 --- a/content/renderer/internal_document_state_data.h +++ b/content/renderer/internal_document_state_data.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "url/gurl.h" namespace WebKit { class WebDataSource; diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h index 842ae83..6dbdb10 100644 --- a/content/renderer/media/android/media_info_loader.h +++ b/content/renderer/media/android/media_info_loader.h @@ -11,9 +11,9 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/web/WebMediaPlayer.h" +#include "url/gurl.h" #include "webkit/renderer/media/active_loader.h" namespace WebKit { diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.h b/content/renderer/media/android/webmediaplayer_proxy_android.h index 62ee49a..c67d790 100644 --- a/content/renderer/media/android/webmediaplayer_proxy_android.h +++ b/content/renderer/media/android/webmediaplayer_proxy_android.h @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/time/time.h" #include "content/public/renderer/render_view_observer.h" -#include "googleurl/src/gurl.h" #include "media/base/android/demuxer_stream_player_params.h" #include "media/base/android/media_player_android.h" #include "media/base/media_keys.h" +#include "url/gurl.h" namespace content { class WebMediaPlayerAndroid; diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc index ef73151..80b3473 100644 --- a/content/renderer/media/media_stream_dispatcher.cc +++ b/content/renderer/media/media_stream_dispatcher.cc @@ -10,7 +10,7 @@ #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc index dea27be..23bad84 100644 --- a/content/renderer/media/media_stream_dispatcher_unittest.cc +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc @@ -11,8 +11,8 @@ #include "content/public/common/media_stream_request.h" #include "content/renderer/media/media_stream_dispatcher.h" #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace content { namespace { diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h index efb4328..23ecec0 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.h +++ b/content/renderer/media/mock_media_stream_dispatcher.h @@ -8,7 +8,7 @@ #include <string> #include "content/renderer/media/media_stream_dispatcher.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/media/webrtc_identity_service.h b/content/renderer/media/webrtc_identity_service.h index 6e22671..7ff18ba 100644 --- a/content/renderer/media/webrtc_identity_service.h +++ b/content/renderer/media/webrtc_identity_service.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "content/public/renderer/render_process_observer.h" -#include "googleurl/src/gurl.h" #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/pepper/pepper_file_system_host.h b/content/renderer/pepper/pepper_file_system_host.h index d955777..ca4a328 100644 --- a/content/renderer/pepper/pepper_file_system_host.h +++ b/content/renderer/pepper/pepper_file_system_host.h @@ -7,10 +7,10 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "googleurl/src/gurl.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/host/host_message_context.h" #include "ppapi/host/resource_host.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc index 3aaa36a..c6fef9b 100644 --- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc @@ -12,9 +12,9 @@ #include "content/renderer/media/audio_input_message_filter.h" #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" #include "content/renderer/render_thread_impl.h" -#include "googleurl/src/gurl.h" #include "media/audio/audio_manager_base.h" #include "ppapi/shared_impl/ppb_audio_config_shared.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.cc b/content/renderer/pepper/pepper_platform_context_3d_impl.cc index 4ffcd63..15e973f 100644 --- a/content/renderer/pepper/pepper_platform_context_3d_impl.cc +++ b/content/renderer/pepper/pepper_platform_context_3d_impl.cc @@ -9,12 +9,12 @@ #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/renderer/render_thread_impl.h" -#include "googleurl/src/gurl.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/ipc/command_buffer_proxy.h" #include "ppapi/c/pp_graphics_3d.h" #include "ui/gl/gpu_preference.h" +#include "url/gurl.h" #ifdef ENABLE_GPU diff --git a/content/renderer/pepper/pepper_platform_video_capture_impl.cc b/content/renderer/pepper/pepper_platform_video_capture_impl.cc index 95fc6d0..0d13c01 100644 --- a/content/renderer/pepper/pepper_platform_video_capture_impl.cc +++ b/content/renderer/pepper/pepper_platform_video_capture_impl.cc @@ -10,8 +10,8 @@ #include "content/renderer/media/video_capture_impl_manager.h" #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" #include "content/renderer/render_thread_impl.h" -#include "googleurl/src/gurl.h" #include "media/video/capture/video_capture_proxy.h" +#include "url/gurl.h" namespace content { diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 93bb3cb..8c3a3b4 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -61,7 +61,6 @@ #include "content/renderer/render_view_impl.h" #include "content/renderer/render_widget_fullscreen_pepper.h" #include "content/renderer/webplugin_delegate_proxy.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_channel_handle.h" #include "media/base/audio_hardware_config.h" #include "media/video/capture/video_capture_proxy.h" @@ -93,6 +92,7 @@ #include "third_party/WebKit/public/web/WebScreenInfo.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/size.h" +#include "url/gurl.h" #include "webkit/plugins/npapi/webplugin.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 4c6e897..8b13436 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -38,7 +38,6 @@ #include "content/renderer/renderer_clipboard_client.h" #include "content/renderer/webclipboard_impl.h" #include "content/renderer/websharedworkerrepository_impl.h" -#include "googleurl/src/gurl.h" #include "gpu/config/gpu_info.h" #include "ipc/ipc_sync_message_filter.h" #include "media/audio/audio_output_device.h" @@ -46,8 +45,6 @@ #include "media/filters/stream_parser_factory.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" -#include "third_party/WebKit/public/web/WebFrame.h" -#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/platform/WebBlobRegistry.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebGamepads.h" @@ -56,6 +53,9 @@ #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "url/gurl.h" #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webfileutilities_impl.h" diff --git a/content/renderer/savable_resources.h b/content/renderer/savable_resources.h index 1aa4129..52b5114 100644 --- a/content/renderer/savable_resources.h +++ b/content/renderer/savable_resources.h @@ -9,8 +9,8 @@ #include <vector> #include "content/common/content_export.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "url/gurl.h" namespace WebKit { class WebElement; diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc index bd30d23..9616dbb 100644 --- a/content/renderer/web_ui_extension.cc +++ b/content/renderer/web_ui_extension.cc @@ -13,10 +13,10 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" #include "content/renderer/web_ui_extension_data.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" +#include "url/gurl.h" #include "v8/include/v8.h" namespace content { diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc index 78e0a80..7aab1f0 100644 --- a/content/renderer/webclipboard_impl.cc +++ b/content/renderer/webclipboard_impl.cc @@ -11,7 +11,6 @@ #include "content/public/common/drop_data.h" #include "content/renderer/drop_data_builder.h" #include "content/renderer/scoped_clipboard_writer_glue.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebImage.h" @@ -22,6 +21,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/custom_data_helper.h" +#include "url/gurl.h" #include "webkit/glue/webkit_glue.h" #include "webkit/renderer/clipboard_utils.h" diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h index 8d98900..d0ec957 100644 --- a/content/renderer/webplugin_delegate_proxy.h +++ b/content/renderer/webplugin_delegate_proxy.h @@ -12,13 +12,13 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/surface/transport_dib.h" +#include "url/gurl.h" #include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/plugins/webplugininfo.h" diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index e376b07..75c7b55 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "third_party/WebKit/public/web/WebSharedWorker.h" +#include "url/gurl.h" namespace content { diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc index 5ef54c2..08df6a4 100644 --- a/content/shell/android/shell_manager.cc +++ b/content/shell/android/shell_manager.cc @@ -9,13 +9,12 @@ #include "base/android/scoped_java_ref.h" #include "base/bind.h" #include "base/lazy_instance.h" +#include "content/public/browser/web_contents.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_content_browser_client.h" -#include "content/public/browser/web_contents.h" -#include "content/shell/shell.h" -#include "googleurl/src/gurl.h" #include "jni/ShellManager_jni.h" +#include "url/gurl.h" using base::android::ScopedJavaLocalRef; diff --git a/content/shell/common/shell_test_configuration.h b/content/shell/common/shell_test_configuration.h index 2761a15..d2d8ead 100644 --- a/content/shell/common/shell_test_configuration.h +++ b/content/shell/common/shell_test_configuration.h @@ -8,8 +8,8 @@ #include <string> #include "base/files/file_path.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/size.h" +#include "url/gurl.h" namespace content { diff --git a/content/shell/renderer/shell_media_stream_client.cc b/content/shell/renderer/shell_media_stream_client.cc index 48580a6..092cbec 100644 --- a/content/shell/renderer/shell_media_stream_client.cc +++ b/content/shell/renderer/shell_media_stream_client.cc @@ -5,11 +5,11 @@ #include "content/shell/renderer/shell_media_stream_client.h" #include "content/shell/renderer/shell_video_frame_provider.h" -#include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebMediaStream.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" +#include "url/gurl.h" #include "webkit/renderer/media/media_stream_audio_renderer.h" using namespace WebKit; diff --git a/content/shell/shell_application_mac.mm b/content/shell/shell_application_mac.mm index a810804..7910dfe 100644 --- a/content/shell/shell_application_mac.mm +++ b/content/shell/shell_application_mac.mm @@ -8,7 +8,7 @@ #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_content_browser_client.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" @implementation ShellCrApplication diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index 71ee4d5..82c9d8f 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -19,11 +19,11 @@ #include "content/shell/shell_browser_context.h" #include "content/shell/shell_devtools_delegate.h" #include "content/shell/shell_net_log.h" -#include "googleurl/src/gurl.h" #include "grit/net_resources.h" #include "net/base/net_module.h" #include "net/base/net_util.h" #include "ui/base/resource/resource_bundle.h" +#include "url/gurl.h" #if defined(ENABLE_PLUGINS) #include "content/public/browser/plugin_service.h" diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc index 412f24c..9a8bc8f 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/shell_content_browser_client.cc @@ -28,7 +28,7 @@ #include "content/shell/shell_resource_dispatcher_host_delegate.h" #include "content/shell/shell_web_contents_view_delegate_creator.h" #include "content/shell/webkit_test_controller.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/common/webpreferences.h" #if defined(OS_ANDROID) diff --git a/content/shell/shell_layout_tests_android.cc b/content/shell/shell_layout_tests_android.cc index 756dd67..41fa80f 100644 --- a/content/shell/shell_layout_tests_android.cc +++ b/content/shell/shell_layout_tests_android.cc @@ -12,8 +12,8 @@ #include "base/message_loop.h" #include "content/public/test/nested_message_pump_android.h" #include "content/shell/common/shell_switches.h" -#include "googleurl/src/gurl.h" #include "jni/ShellLayoutTestUtils_jni.h" +#include "url/gurl.h" namespace { diff --git a/content/shell/shell_mac.mm b/content/shell/shell_mac.mm index 7bb3b30..7efbb18 100644 --- a/content/shell/shell_mac.mm +++ b/content/shell/shell_mac.mm @@ -14,8 +14,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/shell/app/resource.h" -#include "googleurl/src/gurl.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h" +#include "url/gurl.h" #if !defined(MAC_OS_X_VERSION_10_7) || \ MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 diff --git a/content/test/content_browser_test_utils.h b/content/test/content_browser_test_utils.h index 599c254..09f44b8 100644 --- a/content/test/content_browser_test_utils.h +++ b/content/test/content_browser_test_utils.h @@ -6,8 +6,8 @@ #define CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_H_ #include "base/memory/ref_counted.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" +#include "url/gurl.h" namespace base { class FilePath; diff --git a/content/test/net/url_request_failed_job.h b/content/test/net/url_request_failed_job.h index fd8b435..4e64440 100644 --- a/content/test/net/url_request_failed_job.h +++ b/content/test/net/url_request_failed_job.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request_job.h" +#include "url/gurl.h" namespace content { diff --git a/content/test/net/url_request_slow_download_job.cc b/content/test/net/url_request_slow_download_job.cc index 7294f6e..425f578 100644 --- a/content/test/net/url_request_slow_download_job.cc +++ b/content/test/net/url_request_slow_download_job.cc @@ -11,12 +11,12 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_filter.h" +#include "url/gurl.h" namespace content { diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h index e4e9ed5..8dd312d 100644 --- a/content/worker/websharedworker_stub.h +++ b/content/worker/websharedworker_stub.h @@ -8,9 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "content/worker/websharedworkerclient_proxy.h" #include "content/worker/worker_webapplicationcachehost_impl.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "third_party/WebKit/public/web/WebSharedWorker.h" +#include "url/gurl.h" namespace WebKit { class WebSharedWorker; |