diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 22:11:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 22:11:00 +0000 |
| commit | a6483d2d878a688ab9eb7cee97147938e8089968 (patch) | |
| tree | b38fd60614f7670f06486e480f5d80876e774696 /chrome | |
| parent | 07384f6155f0359d61869589d97267f21f9eb2e9 (diff) | |
| download | chromium_src-a6483d2d878a688ab9eb7cee97147938e8089968.zip chromium_src-a6483d2d878a688ab9eb7cee97147938e8089968.tar.gz chromium_src-a6483d2d878a688ab9eb7cee97147938e8089968.tar.bz2 | |
chrome/browser: Migrate from googleurl/ includes to url/ ones. Part 2
BUG=229660
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/18251003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
272 files changed, 277 insertions, 277 deletions
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc index 81759e6..04379c3 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_util.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // TODO(yoshiki): move the following method to accessibility_manager.cc and // remove this file. diff --git a/chrome/browser/chromeos/attestation/attestation_ca_client.cc b/chrome/browser/chromeos/attestation/attestation_ca_client.cc index 69d162e..4a9aca6 100644 --- a/chrome/browser/chromeos/attestation/attestation_ca_client.cc +++ b/chrome/browser/chromeos/attestation/attestation_ca_client.cc @@ -7,11 +7,11 @@ #include <string> #include "chrome/browser/browser_process.h" -#include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service.h b/chrome/browser/chromeos/contacts/gdata_contacts_service.h index 47f30ef..36b61d1 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service.h +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service.h @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h index 7f33edb..09b0b56 100644 --- a/chrome/browser/chromeos/customization_document.h +++ b/chrome/browser/chromeos/customization_document.h @@ -13,8 +13,8 @@ #include "base/memory/singleton.h" #include "base/timer/timer.h" #include "base/values.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" +#include "url/gurl.h" class PrefRegistrySimple; diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc index 33c4581..e35ce0f 100644 --- a/chrome/browser/chromeos/display/display_preferences.cc +++ b/chrome/browser/chromeos/display/display_preferences.cc @@ -20,12 +20,12 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" #include "chromeos/display/output_configurator.h" -#include "googleurl/src/url_canon.h" -#include "googleurl/src/url_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/gfx/display.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" +#include "url/url_canon.h" +#include "url/url_util.h" namespace chromeos { namespace { diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc index 99548da..31cebd6 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.cc +++ b/chrome/browser/chromeos/drive/change_list_loader.cc @@ -19,7 +19,7 @@ #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/google_apis/drive_api_parser.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/change_list_processor.h b/chrome/browser/chromeos/drive/change_list_processor.h index fb8d20a..a80e3c7 100644 --- a/chrome/browser/chromeos/drive/change_list_processor.h +++ b/chrome/browser/chromeos/drive/change_list_processor.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace google_apis { class AboutResource; diff --git a/chrome/browser/chromeos/drive/drive_app_registry.h b/chrome/browser/chromeos/drive/drive_app_registry.h index b4cba84..935c61a 100644 --- a/chrome/browser/chromeos/drive/drive_app_registry.h +++ b/chrome/browser/chromeos/drive/drive_app_registry.h @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/drive_protocol_handler.cc b/chrome/browser/chromeos/drive/drive_protocol_handler.cc index 441b582..a01a4db 100644 --- a/chrome/browser/chromeos/drive/drive_protocol_handler.cc +++ b/chrome/browser/chromeos/drive/drive_protocol_handler.cc @@ -11,8 +11,8 @@ #include "chrome/browser/chromeos/drive/drive_url_request_job.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system/search_operation.cc b/chrome/browser/chromeos/drive/file_system/search_operation.cc index ea4a63a..2bf067a 100644 --- a/chrome/browser/chromeos/drive/file_system/search_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/search_operation.cc @@ -17,7 +17,7 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system_util.h b/chrome/browser/chromeos/drive/file_system_util.h index e57c695..a1cd2e7 100644 --- a/chrome/browser/chromeos/drive/file_system_util.h +++ b/chrome/browser/chromeos/drive/file_system_util.h @@ -10,7 +10,7 @@ #include "base/callback_forward.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/google_apis/gdata_errorcode.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion.cc b/chrome/browser/chromeos/drive/resource_entry_conversion.cc index 9ba85ad..d37f9a6 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion.cc @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "googleurl/src/gurl.h" #include "net/base/escape.h" +#include "url/gurl.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc index 619d5d13..08ba2e5 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace drive { diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 228207e..cb4acbb 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -29,7 +29,6 @@ #include "chrome/common/chrome_paths.h" #include "chromeos/login/login_state.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "grit/app_locale_settings.h" #include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" @@ -39,6 +38,7 @@ #include "ui/aura/window_observer.h" #include "ui/base/l10n/l10n_util.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using base::BinaryValue; using content::BrowserThread; diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index c44ce44..724cd54 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -11,13 +11,13 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" #include "ui/views/controls/message_box_view.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/chromeos/fileapi/cros_mount_point_provider_unittest.cc b/chrome/browser/chromeos/fileapi/cros_mount_point_provider_unittest.cc index b74bdf8..773e05d 100644 --- a/chrome/browser/chromeos/fileapi/cros_mount_point_provider_unittest.cc +++ b/chrome/browser/chromeos/fileapi/cros_mount_point_provider_unittest.cc @@ -9,8 +9,8 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "chromeos/dbus/cros_disks_client.h" -#include "googleurl/src/url_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/url_util.h" #include "webkit/browser/fileapi/external_mount_points.h" #include "webkit/browser/fileapi/file_permission_policy.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/chromeos/fileapi/remote_file_system_operation.cc b/chrome/browser/chromeos/fileapi/remote_file_system_operation.cc index 2a036d2..4a312ec 100644 --- a/chrome/browser/chromeos/fileapi/remote_file_system_operation.cc +++ b/chrome/browser/chromeos/fileapi/remote_file_system_operation.cc @@ -9,8 +9,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/fileapi/remote_file_stream_writer.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/file_writer_delegate.h" diff --git a/chrome/browser/chromeos/imageburner/burn_controller.cc b/chrome/browser/chromeos/imageburner/burn_controller.cc index 7da990d..24e426a 100644 --- a/chrome/browser/chromeos/imageburner/burn_controller.cc +++ b/chrome/browser/chromeos/imageburner/burn_controller.cc @@ -10,8 +10,8 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/imageburner/burn_manager.h" #include "chromeos/network/network_state_handler.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "url/gurl.h" namespace chromeos { namespace imageburner { diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h index b44a307..23cf662 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.h +++ b/chrome/browser/chromeos/imageburner/burn_manager.h @@ -19,8 +19,8 @@ #include "chrome/browser/chromeos/imageburner/burn_device_handler.h" #include "chromeos/disks/disk_mount_manager.h" #include "chromeos/network/network_state_handler_observer.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/chrome/browser/chromeos/login/auth_prewarmer.cc b/chrome/browser/chromeos/login/auth_prewarmer.cc index 9f4471b..cfaa305 100644 --- a/chrome/browser/chromeos/login/auth_prewarmer.cc +++ b/chrome/browser/chromeos/login/auth_prewarmer.cc @@ -11,7 +11,7 @@ #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/browser_thread.h" #include "google_apis/gaia/gaia_urls.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/captive_portal_view.cc b/chrome/browser/chromeos/login/captive_portal_view.cc index ca53bec..3351417 100644 --- a/chrome/browser/chromeos/login/captive_portal_view.cc +++ b/chrome/browser/chromeos/login/captive_portal_view.cc @@ -10,9 +10,9 @@ #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h" #include "chrome/browser/chromeos/net/connectivity_state_helper.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index 5096919..8576033 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc @@ -32,7 +32,6 @@ #include "chromeos/dbus/session_manager_client.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" -#include "googleurl/src/gurl.h" #include "gpu/command_buffer/service/gpu_switches.h" #include "media/base/media_switches.h" #include "ui/base/ui_base_switches.h" @@ -40,6 +39,7 @@ #include "ui/gfx/switches.h" #include "ui/gl/gl_switches.h" #include "ui/views/corewm/corewm_switches.h" +#include "url/gurl.h" #include "webkit/plugins/plugin_switches.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index 1dc7609..220f99c 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -24,8 +24,8 @@ #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc index 67fe948..904a19b 100644 --- a/chrome/browser/chromeos/login/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/login_display_host_impl.cc @@ -61,7 +61,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" @@ -76,6 +75,7 @@ #include "ui/gfx/transform.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 98f1764..8285a53 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -72,10 +72,10 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "google_apis/gaia/gaia_auth_consumer.h" -#include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/login_web_dialog.h b/chrome/browser/chromeos/login/login_web_dialog.h index dbcca81..c92596c 100644 --- a/chrome/browser/chromeos/login/login_web_dialog.h +++ b/chrome/browser/chromeos/login/login_web_dialog.h @@ -10,10 +10,10 @@ #include "base/compiler_specific.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/merge_session_load_page.h b/chrome/browser/chromeos/login/merge_session_load_page.h index 9556a63..190b589 100644 --- a/chrome/browser/chromeos/login/merge_session_load_page.h +++ b/chrome/browser/chromeos/login/merge_session_load_page.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "content/public/browser/interstitial_page_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/chromeos/login/mock_login_utils.h b/chrome/browser/chromeos/login/mock_login_utils.h index 0710c9b..c01726e 100644 --- a/chrome/browser/chromeos/login/mock_login_utils.h +++ b/chrome/browser/chromeos/login/mock_login_utils.h @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/login/login_display_host.h" #include "chrome/browser/chromeos/login/login_utils.h" #include "google_apis/gaia/gaia_auth_consumer.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" +#include "url/gurl.h" class PrefService; class Profile; diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc index a90d84a..aa9da1f 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.cc +++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc @@ -9,12 +9,12 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/strings/stringprintf.h" -#include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h index 8756165..f7c351a 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.h +++ b/chrome/browser/chromeos/login/mock_url_fetchers.h @@ -10,9 +10,9 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "googleurl/src/gurl.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" namespace net { class URLFetcherDelegate; diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc index 34c089f..81a7f3d 100644 --- a/chrome/browser/chromeos/login/online_attempt_unittest.cc +++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc @@ -18,9 +18,9 @@ #include "content/public/test/test_browser_thread.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/mock_url_fetcher_factory.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::AnyNumber; using ::testing::Invoke; diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index be05b21..d57c0f1 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -29,12 +29,12 @@ #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "content/public/test/test_browser_thread.h" #include "google_apis/gaia/mock_url_fetcher_factory.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/cros_system_api/dbus/service_constants.h" +#include "url/gurl.h" using ::testing::AnyNumber; using ::testing::DoAll; diff --git a/chrome/browser/chromeos/login/resource_loader_browsertest.cc b/chrome/browser/chromeos/login/resource_loader_browsertest.cc index 969085d..fe106b8 100644 --- a/chrome/browser/chromeos/login/resource_loader_browsertest.cc +++ b/chrome/browser/chromeos/login/resource_loader_browsertest.cc @@ -14,9 +14,9 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_details.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index f2b0bda..6b1faae 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -43,9 +43,9 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using content::BrowserThread; using content::UserMetricsAction; diff --git a/chrome/browser/chromeos/login/screens/eula_screen.h b/chrome/browser/chromeos/login/screens/eula_screen.h index f93d3dc..bc64809 100644 --- a/chrome/browser/chromeos/login/screens/eula_screen.h +++ b/chrome/browser/chromeos/login/screens/eula_screen.h @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/login/screens/eula_screen_actor.h" #include "chrome/browser/chromeos/login/screens/wizard_screen.h" #include "chrome/browser/chromeos/login/tpm_password_fetcher.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screens/eula_screen_actor.h b/chrome/browser/chromeos/login/screens/eula_screen_actor.h index 948ad24..2e741a6 100644 --- a/chrome/browser/chromeos/login/screens/eula_screen_actor.h +++ b/chrome/browser/chromeos/login/screens/eula_screen_actor.h @@ -7,8 +7,8 @@ #include <string> -#include "googleurl/src/gurl.h" #include "ui/gfx/size.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc b/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc index 4cc4060..6a09c70 100644 --- a/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc +++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc @@ -17,11 +17,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" -#include "googleurl/src/gurl.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog.h b/chrome/browser/chromeos/login/simple_web_view_dialog.h index 07b02d4..1958342 100644 --- a/chrome/browser/chromeos/login/simple_web_view_dialog.h +++ b/chrome/browser/chromeos/login/simple_web_view_dialog.h @@ -15,9 +15,9 @@ #include "components/web_modal/web_contents_modal_dialog_host.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents_delegate.h" -#include "googleurl/src/gurl.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/widget/widget_delegate.h" +#include "url/gurl.h" class CommandUpdater; class Profile; diff --git a/chrome/browser/chromeos/login/user_image.h b/chrome/browser/chromeos/login/user_image.h index 1bae8d8..b1e3933 100644 --- a/chrome/browser/chromeos/login/user_image.h +++ b/chrome/browser/chromeos/login/user_image.h @@ -7,8 +7,8 @@ #include <vector> -#include "googleurl/src/gurl.h" #include "ui/gfx/image/image_skia.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h index 192ef93..8022003 100644 --- a/chrome/browser/chromeos/login/wizard_controller.h +++ b/chrome/browser/chromeos/login/wizard_controller.h @@ -15,8 +15,8 @@ #include "base/timer/timer.h" #include "chrome/browser/chromeos/login/screens/screen_observer.h" #include "chrome/browser/chromeos/login/screens/wizard_screen.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" class PrefRegistrySimple; diff --git a/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc b/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc index 3625a95..66b6272 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc +++ b/chrome/browser/chromeos/memory/oom_priority_manager_browsertest.cc @@ -14,7 +14,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/test/test_utils.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::OpenURLParams; diff --git a/chrome/browser/chromeos/memory/oom_priority_manager_unittest.cc b/chrome/browser/chromeos/memory/oom_priority_manager_unittest.cc index cf5fa16..c227ac2 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager_unittest.cc +++ b/chrome/browser/chromeos/memory/oom_priority_manager_unittest.cc @@ -10,8 +10,8 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/memory/oom_priority_manager.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h index b523f65..eeeef2e 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_impl.h +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h @@ -22,8 +22,8 @@ #include "chromeos/network/network_state_handler_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher.h" +#include "url/gurl.h" namespace net { class URLRequestContextGetter; diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc index 0ce54db..430af00 100644 --- a/chrome/browser/chromeos/net/onc_utils.cc +++ b/chrome/browser/chromeos/net/onc_utils.cc @@ -9,10 +9,10 @@ #include "chrome/browser/chromeos/ui_proxy_config.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chromeos/network/onc/onc_utils.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/proxy/proxy_bypass_rules.h" #include "net/proxy/proxy_server.h" +#include "url/gurl.h" namespace chromeos { namespace onc { diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h index 9d007bc..df8835d 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.h +++ b/chrome/browser/chromeos/offline/offline_load_page.h @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "content/public/browser/interstitial_page_delegate.h" -#include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" +#include "url/gurl.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index c73dadf..0985cfb 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -35,10 +35,10 @@ #include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "components/user_prefs/pref_registry_syncable.h" -#include "googleurl/src/gurl.h" #include "third_party/icu/public/i18n/unicode/timezone.h" #include "ui/base/events/event_constants.h" #include "ui/base/events/event_utils.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/ui/app_launch_view.h b/chrome/browser/chromeos/ui/app_launch_view.h index 51b5854..5ac78eb 100644 --- a/chrome/browser/chromeos/ui/app_launch_view.h +++ b/chrome/browser/chromeos/ui/app_launch_view.h @@ -10,8 +10,8 @@ #include "ash/ash_export.h" #include "base/callback.h" #include "content/public/browser/web_contents_observer.h" -#include "googleurl/src/gurl.h" #include "ui/views/widget/widget_delegate.h" +#include "url/gurl.h" namespace content { class BrowserContent; diff --git a/chrome/browser/chromeos/ui_proxy_config.h b/chrome/browser/chromeos/ui_proxy_config.h index 4541c8f..08fa47f 100644 --- a/chrome/browser/chromeos/ui_proxy_config.h +++ b/chrome/browser/chromeos/ui_proxy_config.h @@ -8,9 +8,9 @@ #include <string> #include "chrome/browser/prefs/proxy_prefs.h" -#include "googleurl/src/gurl.h" #include "net/proxy/proxy_bypass_rules.h" #include "net/proxy/proxy_server.h" +#include "url/gurl.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 13d36e7..3e5ead3 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -47,8 +47,6 @@ #include "content/public/browser/notification_types.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" -#include "googleurl/src/url_parse.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" @@ -62,6 +60,8 @@ #include "net/ssl/ssl_config_service.h" #include "third_party/libevent/evdns.h" #include "third_party/libevent/event.h" +#include "url/gurl.h" +#include "url/url_parse.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc index 4cc3c28..d75f795 100644 --- a/chrome/browser/chromeos/web_socket_proxy_controller.cc +++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc @@ -26,8 +26,8 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index 278a157e..fe7510c 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc @@ -26,8 +26,8 @@ #include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "third_party/re2/re2/re2.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.cc b/chrome/browser/extensions/activity_log/activity_log_policy.cc index 528f260..7fce2fb 100644 --- a/chrome/browser/extensions/activity_log/activity_log_policy.cc +++ b/chrome/browser/extensions/activity_log/activity_log_policy.cc @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/activity_log/activity_log_policy.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using base::TimeDelta; diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.h b/chrome/browser/extensions/activity_log/activity_log_policy.h index 797cba5..ce6ca07 100644 --- a/chrome/browser/extensions/activity_log/activity_log_policy.h +++ b/chrome/browser/extensions/activity_log/activity_log_policy.h @@ -17,7 +17,7 @@ #include "base/values.h" #include "chrome/browser/extensions/activity_log/activity_actions.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; class GURL; diff --git a/chrome/browser/extensions/activity_log/api_actions.cc b/chrome/browser/extensions/activity_log/api_actions.cc index 483d394..3f21404 100644 --- a/chrome/browser/extensions/activity_log/api_actions.cc +++ b/chrome/browser/extensions/activity_log/api_actions.cc @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/activity_log/dom_actions.h b/chrome/browser/extensions/activity_log/dom_actions.h index 904def8..1eff74b 100644 --- a/chrome/browser/extensions/activity_log/dom_actions.h +++ b/chrome/browser/extensions/activity_log/dom_actions.h @@ -8,7 +8,7 @@ #include "base/strings/string16.h" #include "chrome/browser/extensions/activity_log/activity_actions.h" #include "chrome/common/extensions/dom_action_types.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc index ddf56c7..654f6c1 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc @@ -15,8 +15,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/extensions/dom_action_types.h" #include "chrome/common/extensions/extension.h" -#include "googleurl/src/gurl.h" #include "sql/error_delegate_util.h" +#include "url/gurl.h" using base::Callback; using base::FilePath; diff --git a/chrome/browser/extensions/api/api_resource_manager_unittest.cc b/chrome/browser/extensions/api/api_resource_manager_unittest.cc index c3218a2..725d8fe 100644 --- a/chrome/browser/extensions/api/api_resource_manager_unittest.cc +++ b/chrome/browser/extensions/api/api_resource_manager_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace utils = extension_function_test_utils; diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc index d4af336..81f5975 100644 --- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc +++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc index 1c0a0e57..859a111 100644 --- a/chrome/browser/extensions/api/app_window/app_window_api.cc +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc @@ -23,9 +23,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" #if defined(USE_ASH) #include "ash/shell.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.h b/chrome/browser/extensions/api/content_settings/content_settings_store.h index f3e9912..9cd21d36 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_store.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_store.h @@ -18,7 +18,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "extensions/browser/extension_prefs_scope.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { class ListValue; diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h index ef6ae38..8dbc0a4 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.h +++ b/chrome/browser/extensions/api/cookies/cookies_api.h @@ -20,8 +20,8 @@ #include "chrome/common/extensions/api/cookies.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" +#include "url/gurl.h" namespace net { class URLRequestContextGetter; diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index c151c92..fc578e8 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -24,9 +24,9 @@ #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_util.h" +#include "url/gurl.h" using extensions::api::cookies::Cookie; using extensions::api::cookies::CookieStore; diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc index f5f1523..764e028 100644 --- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc +++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc @@ -12,9 +12,9 @@ #include "chrome/browser/extensions/api/cookies/cookies_helpers.h" #include "chrome/common/extensions/api/cookies.h" #include "chrome/test/base/testing_profile.h" -#include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" +#include "url/gurl.h" using extensions::api::cookies::Cookie; using extensions::api::cookies::CookieStore; diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.h b/chrome/browser/extensions/api/declarative_content/content_condition.h index 351aa43..abb86d6 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition.h +++ b/chrome/browser/extensions/api/declarative_content/content_condition.h @@ -16,7 +16,7 @@ #include "base/values.h" #include "chrome/browser/extensions/api/declarative/declarative_rule.h" #include "extensions/common/matcher/url_matcher.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h index 4dcc74b..faa70cf 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h @@ -16,7 +16,7 @@ #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/common/extensions/api/events.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class ExtensionInfoMap; class WebRequestPermission; diff --git a/chrome/browser/extensions/api/dial/dial_apitest.cc b/chrome/browser/extensions/api/dial/dial_apitest.cc index dd83e35..56b4746 100644 --- a/chrome/browser/extensions/api/dial/dial_apitest.cc +++ b/chrome/browser/extensions/api/dial/dial_apitest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/common/chrome_switches.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" +#include "url/gurl.h" using extensions::DialDeviceData; using extensions::Extension; diff --git a/chrome/browser/extensions/api/dial/dial_device_data.h b/chrome/browser/extensions/api/dial/dial_device_data.h index ddda6b7..a59900c 100644 --- a/chrome/browser/extensions/api/dial/dial_device_data.h +++ b/chrome/browser/extensions/api/dial/dial_device_data.h @@ -10,7 +10,7 @@ #include "base/time/time.h" #include "base/values.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc index 3e1b034..dd5c023b0 100644 --- a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/api/dial/dial_registry.h" #include "chrome/browser/extensions/api/dial/dial_service.h" #include "chrome/test/base/testing_profile.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 base::Time; using base::TimeDelta; diff --git a/chrome/browser/extensions/api/dial/dial_service.cc b/chrome/browser/extensions/api/dial/dial_service.cc index b4bc70e..2a2b8c3 100644 --- a/chrome/browser/extensions/api/dial/dial_service.cc +++ b/chrome/browser/extensions/api/dial/dial_service.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/common/chrome_version_info.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" @@ -24,6 +23,7 @@ #include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" +#include "url/gurl.h" #if defined(OS_CHROMEOS) #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" diff --git a/chrome/browser/extensions/api/feedback_private/blob_reader.h b/chrome/browser/extensions/api/feedback_private/blob_reader.h index c937b4d..6c05b20 100644 --- a/chrome/browser/extensions/api/feedback_private/blob_reader.h +++ b/chrome/browser/extensions/api/feedback_private/blob_reader.h @@ -9,10 +9,10 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" class Profile; namespace net { diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index b8f107f..4a12cd3 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -12,10 +12,10 @@ #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" -#include "googleurl/src/url_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/webui/web_ui_util.h" +#include "url/url_util.h" namespace extensions { diff --git a/chrome/browser/extensions/api/history/history_apitest.cc b/chrome/browser/extensions/api/history/history_apitest.cc index f2394e0..2d8e5f0 100644 --- a/chrome/browser/extensions/api/history/history_apitest.cc +++ b/chrome/browser/extensions/api/history/history_apitest.cc @@ -14,8 +14,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/identity/experimental_identity_api.cc b/chrome/browser/extensions/api/identity/experimental_identity_api.cc index 1845aed..f26c3bb 100644 --- a/chrome/browser/extensions/api/identity/experimental_identity_api.cc +++ b/chrome/browser/extensions/api/identity/experimental_identity_api.cc @@ -28,8 +28,8 @@ #include "chrome/common/url_constants.h" #include "content/public/common/page_transition_types.h" #include "google_apis/gaia/gaia_constants.h" -#include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" +#include "url/gurl.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc b/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc index 12afd78..eb33b6c 100644 --- a/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc @@ -22,9 +22,9 @@ #include "extensions/common/id_util.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_mint_token_flow.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::Return; diff --git a/chrome/browser/extensions/api/identity/experimental_web_auth_flow.cc b/chrome/browser/extensions/api/identity/experimental_web_auth_flow.cc index e06a3b9..e661a37 100644 --- a/chrome/browser/extensions/api/identity/experimental_web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/experimental_web_auth_flow.cc @@ -17,8 +17,8 @@ #include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" +#include "url/gurl.h" using content::LoadNotificationDetails; using content::NavigationController; diff --git a/chrome/browser/extensions/api/identity/experimental_web_auth_flow.h b/chrome/browser/extensions/api/identity/experimental_web_auth_flow.h index 0dc2654..483742e 100644 --- a/chrome/browser/extensions/api/identity/experimental_web_auth_flow.h +++ b/chrome/browser/extensions/api/identity/experimental_web_auth_flow.h @@ -9,8 +9,8 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" class Profile; class ExperimentalWebAuthFlowTest; diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 3191610..407948f 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -33,7 +33,7 @@ #include "chrome/common/url_constants.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index 8659114..d09c6f7 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -23,11 +23,11 @@ #include "extensions/common/id_util.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_mint_token_flow.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.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::Return; diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc index 4a8f2ad..2986b16 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc @@ -27,8 +27,8 @@ #include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "crypto/random.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" +#include "url/gurl.h" using apps::ShellWindow; using content::RenderViewHost; diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.h b/chrome/browser/extensions/api/identity/web_auth_flow.h index cbe42c6..a3764ec 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.h +++ b/chrome/browser/extensions/api/identity/web_auth_flow.h @@ -11,8 +11,8 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" class Profile; class WebAuthFlowTest; diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc index c85d58a..45737e5 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc index 6ef2531..52b8989 100644 --- a/chrome/browser/extensions/api/messaging/message_service.cc +++ b/chrome/browser/extensions/api/messaging/message_service.cc @@ -35,7 +35,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::SiteInstance; using content::WebContents; diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc index 9187a08..b39ea79 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc @@ -15,11 +15,11 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/features/feature.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc index 4a8a24d..d9236ba 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc @@ -9,8 +9,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/string_escape.h" #include "extensions/common/url_pattern_set.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc index c973aa0..a10801e 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index b5f9600..d0a5800 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -21,13 +21,13 @@ #include "chrome/common/extensions/features/feature.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" -#include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/message_center_util.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/page_launcher/page_launcher_api.cc b/chrome/browser/extensions/api/page_launcher/page_launcher_api.cc index c52a012..e0f8241 100644 --- a/chrome/browser/extensions/api/page_launcher/page_launcher_api.cc +++ b/chrome/browser/extensions/api/page_launcher/page_launcher_api.cc @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/page_launcher.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index c758578..e23658f 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -16,7 +16,7 @@ #include "chrome/common/extensions/permissions/permissions_info.h" #include "extensions/common/error_utils.h" #include "extensions/common/url_pattern_set.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc index 3ec4abc..22e2015 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc @@ -8,8 +8,8 @@ #include "chrome/common/extensions/api/permissions.h" #include "chrome/common/extensions/permissions/permission_set.h" #include "extensions/common/url_pattern_set.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using extensions::api::permissions::Permissions; using extensions::permissions_api_helpers::PackPermissionSet; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index 9d89f17..dc9d313 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -34,7 +34,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "google_apis/gaia/gaia_constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/rtc_private/rtc_private_apitest.cc b/chrome/browser/extensions/api/rtc_private/rtc_private_apitest.cc index d0bd835..ba0cf57 100644 --- a/chrome/browser/extensions/api/rtc_private/rtc_private_apitest.cc +++ b/chrome/browser/extensions/api/rtc_private/rtc_private_apitest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/api/runtime/runtime_api.cc b/chrome/browser/extensions/api/runtime/runtime_api.cc index c04d181..d42fdf1 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api.cc @@ -31,7 +31,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "extensions/common/error_utils.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/browser/fileapi/isolated_context.h" namespace GetPlatformInfo = extensions::api::runtime::GetPlatformInfo; diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h index 80e47a6..1195c4d 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.h +++ b/chrome/browser/extensions/api/tabs/tabs_api.h @@ -16,7 +16,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/common/extension_resource.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class BackingStore; class GURL; diff --git a/chrome/browser/extensions/api/terminal/terminal_extension_helper.h b/chrome/browser/extensions/api/terminal/terminal_extension_helper.h index 1599387..bd20147 100644 --- a/chrome/browser/extensions/api/terminal/terminal_extension_helper.h +++ b/chrome/browser/extensions/api/terminal/terminal_extension_helper.h @@ -7,7 +7,7 @@ #include <string> -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h index d51c283..0f2823c 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h @@ -9,7 +9,7 @@ #include <set> #include "base/compiler_specific.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class RenderViewHost; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index bae2e27..d0a6a69 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -23,7 +23,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" struct RetargetingDetails; diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 38e35f3..08a8dd0 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -53,7 +53,6 @@ #include "extensions/common/error_utils.h" #include "extensions/common/event_filtering_info.h" #include "extensions/common/url_pattern.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/auth.h" #include "net/base/net_errors.h" @@ -61,6 +60,7 @@ #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using base::DictionaryValue; using base::ListValue; diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h index 76325b3..9b849c1 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h +++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h @@ -16,10 +16,10 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/extensions/extension_warning_set.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" +#include "url/gurl.h" #include "webkit/glue/resource_type.h" namespace base { diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc index a3d4b50..a0970d6 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc @@ -13,8 +13,8 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/resource_request_info.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" using content::ResourceRequestInfo; diff --git a/chrome/browser/extensions/api/web_request/web_request_time_tracker.h b/chrome/browser/extensions/api/web_request/web_request_time_tracker.h index ff33e70..3985563 100644 --- a/chrome/browser/extensions/api/web_request/web_request_time_tracker.h +++ b/chrome/browser/extensions/api/web_request/web_request_time_tracker.h @@ -13,7 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { class Time; diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index a1950d1..97f923d 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -20,8 +20,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" +#include "url/gurl.h" using extensions::Extension; diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index 48f6cc6..9b0b553 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -14,9 +14,9 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" +#include "url/gurl.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) { ASSERT_TRUE(StartEmbeddedTestServer()); diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index e823819..8bc59bc 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -23,7 +23,7 @@ #include "chrome/common/extensions/user_script.h" #include "crypto/sha2.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index e1dcf8e..5f844ab 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -26,9 +26,9 @@ #include "chrome/common/web_application_info.h" #include "crypto/sha2.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index cea76d4f..1fb1a4e 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -24,9 +24,9 @@ #include "chrome/common/web_application_info.h" #include "extensions/common/extension_resource.h" #include "extensions/common/url_pattern.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/codec/png_codec.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/data_deleter.h b/chrome/browser/extensions/data_deleter.h index 1ded55a..f2dcbd4 100644 --- a/chrome/browser/extensions/data_deleter.h +++ b/chrome/browser/extensions/data_deleter.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DATA_DELETER_H_ #define CHROME_BROWSER_EXTENSIONS_DATA_DELETER_H_ -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc index f04c16e..0c67b31 100644 --- a/chrome/browser/extensions/event_router_forwarder.cc +++ b/chrome/browser/extensions/event_router_forwarder.cc @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc index c3c1056..bb80d11 100644 --- a/chrome/browser/extensions/event_router_forwarder_unittest.cc +++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc @@ -13,9 +13,9 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/test_browser_thread.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 content::BrowserThread; diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc index 62172ea..264c548 100644 --- a/chrome/browser/extensions/extension_action.cc +++ b/chrome/browser/extensions/extension_action.cc @@ -12,7 +12,6 @@ #include "chrome/common/badge_util.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/icon_with_badge_image_source.h" -#include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -30,6 +29,7 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/extension_action_unittest.cc b/chrome/browser/extensions/extension_action_unittest.cc index 2aba574..7656b46 100644 --- a/chrome/browser/extensions/extension_action_unittest.cc +++ b/chrome/browser/extensions/extension_action_unittest.cc @@ -5,8 +5,8 @@ #include "base/message_loop.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc index 0d2e6a1..21c32dc 100644 --- a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc +++ b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc @@ -9,9 +9,9 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h index 85f15ef..27af9e1 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.h +++ b/chrome/browser/extensions/extension_function_dispatcher.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/extension_function.h" #include "ipc/ipc_sender.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class ChromeRenderMessageFilter; class ExtensionInfoMap; diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index 906fe64..8406ed7 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc @@ -12,8 +12,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" +#include "url/gurl.h" class ExtensionIconSourceTest : public ExtensionApiTest { protected: diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index 2b9d995..053c012 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -20,9 +20,9 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" +#include "url/gurl.h" using extensions::Extension; diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index f8c97df..f4b8e39 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -38,7 +38,6 @@ #include "content/public/browser/resource_request_info.h" #include "extensions/common/constants.h" #include "extensions/common/extension_resource.h" -#include "googleurl/src/url_util.h" #include "grit/component_extension_resources_map.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" @@ -48,6 +47,7 @@ #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_simple_job.h" #include "ui/base/resource/resource_bundle.h" +#include "url/url_util.h" using content::ResourceRequestInfo; using extensions::Extension; diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index ffd5d37..05e3588 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -10,8 +10,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" +#include "url/gurl.h" class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { protected: diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 2458305f..a6851a7 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -103,12 +103,12 @@ #include "content/public/browser/url_data_source.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "sync/api/sync_change.h" #include "sync/api/sync_error_factory.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" #include "webkit/browser/database/database_tracker.h" #include "webkit/browser/database/database_util.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 9297723..b1ed198 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -88,7 +88,6 @@ #include "extensions/common/constants.h" #include "extensions/common/extension_resource.h" #include "extensions/common/url_pattern.h" -#include "googleurl/src/gurl.h" #include "gpu/config/gpu_info.h" #include "grit/browser_resources.h" #include "net/cookies/canonical_cookie.h" @@ -104,6 +103,7 @@ #include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "url/gurl.h" #include "webkit/browser/database/database_tracker.h" #include "webkit/browser/quota/quota_manager.h" #include "webkit/common/database/database_identifier.h" diff --git a/chrome/browser/extensions/extension_special_storage_policy.h b/chrome/browser/extensions/extension_special_storage_policy.h index 9b056e3..494c65a 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.h +++ b/chrome/browser/extensions/extension_special_storage_policy.h @@ -10,7 +10,7 @@ #include "base/synchronization/lock.h" #include "chrome/common/extensions/extension_set.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/browser/quota/special_storage_policy.h" class CookieSettings; diff --git a/chrome/browser/extensions/extension_sync_data.h b/chrome/browser/extensions/extension_sync_data.h index cf8ac6d..8fbe73a 100644 --- a/chrome/browser/extensions/extension_sync_data.h +++ b/chrome/browser/extensions/extension_sync_data.h @@ -8,8 +8,8 @@ #include <string> #include "base/version.h" -#include "googleurl/src/gurl.h" #include "sync/api/sync_change.h" +#include "url/gurl.h" namespace syncer { class SyncData; diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc index f7bad7e..637137d 100644 --- a/chrome/browser/extensions/extension_sync_data_unittest.cc +++ b/chrome/browser/extensions/extension_sync_data_unittest.cc @@ -7,10 +7,10 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/version.h" -#include "googleurl/src/gurl.h" #include "sync/protocol/extension_specifics.pb.h" #include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index e8e50b0..9f6fd69 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -28,7 +28,7 @@ #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace keys = extensions::tabs_constants; namespace tabs = extensions::api::tabs; diff --git a/chrome/browser/extensions/extension_tab_util_android.cc b/chrome/browser/extensions/extension_tab_util_android.cc index 6167685..671f862 100644 --- a/chrome/browser/extensions/extension_tab_util_android.cc +++ b/chrome/browser/extensions/extension_tab_util_android.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "chrome/browser/sessions/session_id.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using base::DictionaryValue; using base::ListValue; diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index 8e8e1df..0764187 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::NavigationEntry; diff --git a/chrome/browser/extensions/extension_warning_set.h b/chrome/browser/extensions/extension_warning_set.h index e68cfce..c0510f1 100644 --- a/chrome/browser/extensions/extension_warning_set.h +++ b/chrome/browser/extensions/extension_warning_set.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // TODO(battre) Remove the Extension prefix. diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index ba6f7de..ac982a4 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -28,9 +28,9 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" +#include "url/gurl.h" using extensions::Extension; diff --git a/chrome/browser/extensions/mock_extension_special_storage_policy.h b/chrome/browser/extensions/mock_extension_special_storage_policy.h index 6417368..5fb958d 100644 --- a/chrome/browser/extensions/mock_extension_special_storage_policy.h +++ b/chrome/browser/extensions/mock_extension_special_storage_policy.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // This class is the same as MockSpecialStoragePolicy (in // webkit/browser/quota/mock_special_storage_policy.h), but it inherits diff --git a/chrome/browser/extensions/pending_extension_info.h b/chrome/browser/extensions/pending_extension_info.h index b30e9d1..dbcf1bd 100644 --- a/chrome/browser/extensions/pending_extension_info.h +++ b/chrome/browser/extensions/pending_extension_info.h @@ -10,7 +10,7 @@ #include "base/version.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" FORWARD_DECLARE_TEST(ExtensionServiceTest, AddPendingExtensionFromSync); diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc index fcf1660..b27b6ca 100644 --- a/chrome/browser/extensions/pending_extension_manager.cc +++ b/chrome/browser/extensions/pending_extension_manager.cc @@ -10,7 +10,7 @@ #include "base/version.h" #include "chrome/browser/extensions/extension_service.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index 28168bb..a0cd2c5 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -43,7 +43,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/test/test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using apps::ShellWindow; using content::WebContents; diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc index 1671fd8..47fad1f 100644 --- a/chrome/browser/extensions/plugin_manager.cc +++ b/chrome/browser/extensions/plugin_manager.cc @@ -17,7 +17,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::PluginService; diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc index ab60b52..e200d42 100644 --- a/chrome/browser/extensions/script_badge_controller.cc +++ b/chrome/browser/extensions/script_badge_controller.cc @@ -24,9 +24,9 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc index 982d317..24c4d89 100644 --- a/chrome/browser/extensions/stubs_apitest.cc +++ b/chrome/browser/extensions/stubs_apitest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/ui_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/test/embedded_test_server/embedded_test_server.h" +#include "url/gurl.h" // Tests that we throw errors when you try using extension APIs that aren't // supported in content scripts. diff --git a/chrome/browser/extensions/updater/extension_downloader.h b/chrome/browser/extensions/updater/extension_downloader.h index 29c2fc5..645bba4 100644 --- a/chrome/browser/extensions/updater/extension_downloader.h +++ b/chrome/browser/extensions/updater/extension_downloader.h @@ -9,8 +9,8 @@ #include <map> #include <set> #include <string> -#include <vector> #include <utility> +#include <vector> #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -23,8 +23,8 @@ #include "chrome/browser/extensions/updater/request_queue.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/update_manifest.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/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index 94e0176..3a40f7e 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h @@ -23,7 +23,7 @@ #include "chrome/browser/extensions/updater/manifest_fetch_data.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class ExtensionServiceInterface; class ExtensionSet; diff --git a/chrome/browser/extensions/updater/manifest_fetch_data.h b/chrome/browser/extensions/updater/manifest_fetch_data.h index e830baa..744299b 100644 --- a/chrome/browser/extensions/updater/manifest_fetch_data.h +++ b/chrome/browser/extensions/updater/manifest_fetch_data.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/webstore_data_fetcher.h b/chrome/browser/extensions/webstore_data_fetcher.h index e8119e1..fb8aafd 100644 --- a/chrome/browser/extensions/webstore_data_fetcher.h +++ b/chrome/browser/extensions/webstore_data_fetcher.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" +#include "url/gurl.h" namespace base { class Value; diff --git a/chrome/browser/extensions/webstore_inline_installer_unittest.cc b/chrome/browser/extensions/webstore_inline_installer_unittest.cc index 70e4ba1..a9d2804 100644 --- a/chrome/browser/extensions/webstore_inline_installer_unittest.cc +++ b/chrome/browser/extensions/webstore_inline_installer_unittest.cc @@ -9,8 +9,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace extensions { diff --git a/chrome/browser/extensions/webstore_install_helper.h b/chrome/browser/extensions/webstore_install_helper.h index 5d5c83f..370ce9c27 100644 --- a/chrome/browser/extensions/webstore_install_helper.h +++ b/chrome/browser/extensions/webstore_install_helper.h @@ -10,9 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/utility_process_host_client.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "url/gurl.h" class SkBitmap; diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index bd40ef5..6d16f26 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -41,8 +41,8 @@ #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 "net/base/escape.h" +#include "url/gurl.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/drive/file_system_util.h" diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h index 18b972e..0f9727f 100644 --- a/chrome/browser/extensions/webstore_installer.h +++ b/chrome/browser/extensions/webstore_installer.h @@ -18,9 +18,9 @@ #include "content/public/browser/download_item.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "ui/gfx/image/image_skia.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index 70e61ce..db3eca0 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc @@ -13,7 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/extensions/webstore_startup_installer.h b/chrome/browser/extensions/webstore_startup_installer.h index 2fcd794..b89195b 100644 --- a/chrome/browser/extensions/webstore_startup_installer.h +++ b/chrome/browser/extensions/webstore_startup_installer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_WEBSTORE_STARTUP_INSTALLER_H_ #define CHROME_BROWSER_EXTENSIONS_WEBSTORE_STARTUP_INSTALLER_H_ -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webstore_standalone_installer.h" namespace content { diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index 019acee..678f46f 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc @@ -29,9 +29,9 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/dns/mock_host_resolver.h" +#include "url/gurl.h" using content::WebContents; using extensions::DictionaryBuilder; diff --git a/chrome/browser/ui/active_tab_tracker.h b/chrome/browser/ui/active_tab_tracker.h index f58528c..f7d18e4 100644 --- a/chrome/browser/ui/active_tab_tracker.h +++ b/chrome/browser/ui/active_tab_tracker.h @@ -15,7 +15,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Browser; diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc index 69ef1df..4033b31 100644 --- a/chrome/browser/ui/android/navigation_popup.cc +++ b/chrome/browser/ui/android/navigation_popup.cc @@ -14,7 +14,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/ui_resources.h" #include "jni/NavigationPopup_jni.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -22,6 +21,7 @@ #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/image/image.h" +#include "url/gurl.h" using base::android::ConvertUTF8ToJavaString; using base::android::ScopedJavaLocalRef; diff --git a/chrome/browser/ui/app_list/search/search_webstore_result.h b/chrome/browser/ui/app_list/search/search_webstore_result.h index 4a0052e..0f494b8 100644 --- a/chrome/browser/ui/app_list/search/search_webstore_result.h +++ b/chrome/browser/ui/app_list/search/search_webstore_result.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/ui/app_list/search/webstore_provider.cc b/chrome/browser/ui/app_list/search/webstore_provider.cc index 16c2d30..0a0d14f 100644 --- a/chrome/browser/ui/app_list/search/webstore_provider.cc +++ b/chrome/browser/ui/app_list/search/webstore_provider.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/app_list/search/webstore_result.h" #include "chrome/browser/ui/app_list/search/webstore_search_fetcher.h" #include "chrome/common/extensions/extension_constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/webstore_result.h b/chrome/browser/ui/app_list/search/webstore_result.h index 8743cd5..16d4d12 100644 --- a/chrome/browser/ui/app_list/search/webstore_result.h +++ b/chrome/browser/ui/app_list/search/webstore_result.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/install_observer.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class AppListControllerDelegate; class Profile; diff --git a/chrome/browser/ui/app_list/search/webstore_result_icon_source.h b/chrome/browser/ui/app_list/search/webstore_result_icon_source.h index 06b4fed..3b43335 100644 --- a/chrome/browser/ui/app_list/search/webstore_result_icon_source.h +++ b/chrome/browser/ui/app_list/search/webstore_result_icon_source.h @@ -10,10 +10,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/image_decoder.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" +#include "url/gurl.h" namespace net { class URLFetcher; diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc index ce196e4..442e458 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc @@ -10,8 +10,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" -#include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "url/gurl.h" namespace internal { diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc index 4dc3999..f77cbb1 100644 --- a/chrome/browser/ui/auto_login_prompter.cc +++ b/chrome/browser/ui/auto_login_prompter.cc @@ -23,8 +23,8 @@ #include "components/auto_login_parser/auto_login_parser.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +#include "url/gurl.h" using content::BrowserThread; using content::WebContents; diff --git a/chrome/browser/ui/auto_login_prompter.h b/chrome/browser/ui/auto_login_prompter.h index fdf4d5d..27f28d7 100644 --- a/chrome/browser/ui/auto_login_prompter.h +++ b/chrome/browser/ui/auto_login_prompter.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/ui/auto_login_infobar_delegate.h" #include "content/public/browser/web_contents_observer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace content { class RenderViewHost; diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h index 598c6e5..8be1bd1 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h @@ -34,9 +34,9 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/common/ssl_status.h" -#include "googleurl/src/gurl.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/ui_base_types.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h index 7b0d2a4..20e8226 100644 --- a/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h +++ b/chrome/browser/ui/bookmarks/bookmark_prompt_controller.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Browser; class PrefService; diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h index f6e3cc0..5fbfb8b 100644 --- a/chrome/browser/ui/browser_navigator.h +++ b/chrome/browser/ui/browser_navigator.h @@ -13,9 +13,9 @@ #include "content/public/browser/page_navigator.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 "ui/gfx/rect.h" +#include "url/gurl.h" class Browser; class Profile; diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc index c2a4e3c..2a09364 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc @@ -21,8 +21,8 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" #include "google_apis/gaia/gaia_urls.h" -#include "googleurl/src/gurl.h" #include "net/base/url_util.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "chrome/browser/enumerate_modules_model_win.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm index a9ca820..cc9ff82 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm @@ -11,7 +11,7 @@ #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #include "chrome/browser/ui/cocoa/applescript/error_applescript.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" @implementation BookmarkFolderAppleScript diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm index 04bac0e..e2a0979 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm @@ -11,10 +11,10 @@ #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" +#include "url/gurl.h" typedef BookmarkAppleScriptTest BookmarkFolderAppleScriptTest; diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm index 8e581f2..07c5a1f 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm @@ -9,10 +9,10 @@ #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" +#include "url/gurl.h" typedef BookmarkAppleScriptTest BookmarkItemAppleScriptTest; diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index e2a3539..4bc6df9 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -21,7 +21,7 @@ #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::NavigationController; using content::NavigationEntry; diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm b/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm index f627622..9ebba04 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm @@ -14,9 +14,9 @@ #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" #include "chrome/test/base/in_process_browser_test.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" +#include "url/gurl.h" typedef InProcessBrowserTest WindowAppleScriptTest; diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm index 04bc13a..b36e596 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm @@ -16,8 +16,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" +#include "url/gurl.h" using ::testing::NiceMock; diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm index fed777c..ce723c9 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm @@ -5,10 +5,10 @@ #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" -#include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/parsed_cookie.h" #import "testing/gtest_mac.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm index 98a9d5f..b991fec 100644 --- a/chrome/browser/ui/cocoa/drag_util.mm +++ b/chrome/browser/ui/cocoa/drag_util.mm @@ -8,12 +8,12 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" #import "third_party/mozilla/NSPasteboard+Utils.h" #import "ui/base/dragdrop/cocoa_dnd_util.h" +#include "url/gurl.h" #include "webkit/plugins/webplugininfo.h" using content::PluginService; diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h index 7bd1f23..121ca64 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Browser; diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.h b/chrome/browser/ui/cocoa/external_protocol_dialog.h index e677c3e..5e229f6 100644 --- a/chrome/browser/ui/cocoa/external_protocol_dialog.h +++ b/chrome/browser/ui/cocoa/external_protocol_dialog.h @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/time/time.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" @interface ExternalProtocolDialogController : NSObject { @private diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 29486ff..f1dfd05 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -19,10 +19,10 @@ #include "chrome/browser/shell_integration.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/locale_settings.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" +#include "url/gurl.h" #if defined(GOOGLE_CHROME_BUILD) #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h index 60b986d..f2ce354 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h @@ -6,7 +6,7 @@ #include "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" @class BrowserWindowController; class Browser; diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h index 74f56cc..55a4cd4 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h @@ -10,7 +10,7 @@ #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" @class ExtensionActionContextMenu; class Browser; diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.h b/chrome/browser/ui/cocoa/status_bubble_mac.h index 1366220..d38c9e5 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.h +++ b/chrome/browser/ui/cocoa/status_bubble_mac.h @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/status_bubble.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class StatusBubbleMacTest; diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm index ffd903b..d02f806 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm @@ -11,11 +11,11 @@ #import "chrome/browser/ui/cocoa/bubble_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/status_bubble_mac.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" #include "ui/gfx/point.h" +#include "url/gurl.h" // The test delegate records all of the status bubble object's state // transitions. diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.h b/chrome/browser/ui/cocoa/tabs/tab_controller.h index 93cdbe4..3b516f7 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.h +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.h @@ -10,7 +10,7 @@ #import "chrome/browser/ui/cocoa/hover_close_button.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" #include "chrome/browser/ui/tabs/tab_menu_model.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // The loading/waiting state of the tab. enum TabLoadingState { diff --git a/chrome/browser/ui/cocoa/url_drop_target.mm b/chrome/browser/ui/cocoa/url_drop_target.mm index 1243e72..b1d6fd2 100644 --- a/chrome/browser/ui/cocoa/url_drop_target.mm +++ b/chrome/browser/ui/cocoa/url_drop_target.mm @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "chrome/browser/ui/cocoa/drag_util.h" -#include "googleurl/src/gurl.h" #import "third_party/mozilla/NSPasteboard+Utils.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm index 0f8ebef..c3bb0d6 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm @@ -18,11 +18,11 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" +#include "url/gurl.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h index 9ac5096..fbb19c1 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h @@ -16,8 +16,8 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/common/media_stream_request.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/image/image.h" +#include "url/gurl.h" class ContentSettingBubbleModelDelegate; class Profile; diff --git a/chrome/browser/ui/crypto_module_password_dialog.cc b/chrome/browser/ui/crypto_module_password_dialog.cc index c98d1d8..403e4c9 100644 --- a/chrome/browser/ui/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/crypto_module_password_dialog.cc @@ -10,9 +10,9 @@ #include "base/synchronization/waitable_event.h" #include "content/public/browser/browser_thread.h" #include "crypto/crypto_module_blocking_password_delegate.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h index cecbd7d..334f1bc 100644 --- a/chrome/browser/ui/extensions/application_launch.h +++ b/chrome/browser/ui/extensions/application_launch.h @@ -7,9 +7,9 @@ #include "base/files/file_path.h" #include "chrome/common/extensions/extension_constants.h" -#include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" class Browser; class CommandLine; diff --git a/chrome/browser/ui/external_protocol_dialog_delegate.h b/chrome/browser/ui/external_protocol_dialog_delegate.h index 8862e7e..1fccfb9 100644 --- a/chrome/browser/ui/external_protocol_dialog_delegate.h +++ b/chrome/browser/ui/external_protocol_dialog_delegate.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/time/time.h" #include "chrome/browser/ui/protocol_dialog_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // Provides text for the external protocol handler dialog and handles whether // or not to launch the application for the given protocol. diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h index d8d464d..a1cb0e2 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h @@ -7,9 +7,9 @@ #include "base/timer/timer.h" #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" -#include "googleurl/src/gurl.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/point.h" +#include "url/gurl.h" class Browser; diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h index d3d90fa..bd5bae5 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_ #include "base/strings/string16.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class ExtensionService; diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h index 96bd5f7..22e7f4a 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h @@ -22,8 +22,8 @@ #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" +#include "url/gurl.h" class BookmarkModel; class Profile; diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index aa6030b..cf5cd3d 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -27,7 +27,6 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/menu_gtk.h" #include "components/user_prefs/user_prefs.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -37,6 +36,7 @@ #include "ui/gfx/gtk_util.h" #include "ui/gfx/image/image.h" #include "ui/gfx/point.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc index 81b30f1..1b88bbd 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc @@ -6,9 +6,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "url/gurl.h" TEST(BookmarkUtilsGtkTest, GetNodesFromSelectionInvalid) { std::vector<const BookmarkNode*> nodes; diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index b90cd26..1491b09 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -11,8 +11,8 @@ #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/shell_integration.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc index e6afbd1..42fc76d 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog_gtk.cc @@ -10,11 +10,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "crypto/crypto_module_blocking_password_delegate.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc index 3fb4225..2a690f6 100644 --- a/chrome/browser/ui/gtk/custom_drag.cc +++ b/chrome/browser/ui/gtk/custom_drag.cc @@ -8,12 +8,12 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "content/public/browser/download_item.h" -#include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/image/image.h" +#include "url/gurl.h" using content::DownloadItem; diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc index fdbd29e..0044332 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc @@ -16,7 +16,6 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" @@ -24,6 +23,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc index 2b82adf..3c4e008 100644 --- a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc @@ -28,7 +28,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::RenderViewHost; diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index df8a277..6c07e14 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -31,7 +31,6 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/host_desktop.h" -#include "googleurl/src/gurl.h" #include "grit/chrome_unscaled_resources.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_compat.h" @@ -45,6 +44,7 @@ #include "ui/gfx/image/cairo_cached_surface.h" #include "ui/gfx/image/image.h" #include "ui/gfx/pango_util.h" +#include "url/gurl.h" // These conflict with base/tracked_objects.h, so need to come last. #include <gdk/gdkx.h> // NOLINT diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h index 6e9ad28..2e4bbf4 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.h +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h @@ -29,12 +29,12 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/owned_widget_gtk.h" #include "ui/base/window_open_disposition.h" +#include "url/gurl.h" class ActionBoxButtonGtk; class Browser; diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc index a824049..02bbfde 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc @@ -36,7 +36,6 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/undoview/undo_view.h" @@ -50,6 +49,7 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/font.h" #include "ui/gfx/skia_utils_gtk.h" +#include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/ui/gtk/protocol_dialog_gtk.h b/chrome/browser/ui/gtk/protocol_dialog_gtk.h index 0685b3e..d69b644 100644 --- a/chrome/browser/ui/gtk/protocol_dialog_gtk.h +++ b/chrome/browser/ui/gtk/protocol_dialog_gtk.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/protocol_dialog_delegate.h" -#include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" +#include "url/gurl.h" typedef struct _GtkWidget GtkWidget; diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.h b/chrome/browser/ui/gtk/status_bubble_gtk.h index dbc2b5b..fc5a4e8 100644 --- a/chrome/browser/ui/gtk/status_bubble_gtk.h +++ b/chrome/browser/ui/gtk/status_bubble_gtk.h @@ -15,11 +15,11 @@ #include "chrome/browser/ui/status_bubble.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/owned_widget_gtk.h" #include "ui/gfx/point.h" +#include "url/gurl.h" class GtkThemeService; class Profile; diff --git a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc index 4ec5151..94bb555 100644 --- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc +++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc @@ -27,7 +27,6 @@ #include "content/public/browser/cert_store.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -38,6 +37,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/cairo_cached_surface.h" #include "ui/gfx/image/image.h" +#include "url/gurl.h" using content::OpenURLParams; diff --git a/chrome/browser/ui/login/login_prompt_unittest.cc b/chrome/browser/ui/login/login_prompt_unittest.cc index 109cbca..b2bb2c4e 100644 --- a/chrome/browser/ui/login/login_prompt_unittest.cc +++ b/chrome/browser/ui/login/login_prompt_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/ui/login/login_prompt.h" -#include "googleurl/src/gurl.h" #include "net/base/auth.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" TEST(LoginPromptTest, GetSignonRealm) { scoped_refptr<net::AuthChallengeInfo> auth_info = new net::AuthChallengeInfo; diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h index 3c3c5d2..5b5f594 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/infobars/infobar_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class AlternateNavInfoBarDelegate : public InfoBarDelegate { public: diff --git a/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h b/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h index 8460fef..933a6b1 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h +++ b/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" +#include "url/gurl.h" namespace content { class NavigationController; diff --git a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc index 4ef46f3..0af1195 100644 --- a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc +++ b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc @@ -16,8 +16,8 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" +#include "url/gurl.h" OmniboxCurrentPageDelegateImpl::OmniboxCurrentPageDelegateImpl( OmniboxEditController* controller, diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 642ad0c..f11482c 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -59,8 +59,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "extensions/common/constants.h" -#include "googleurl/src/url_util.h" #include "ui/gfx/image/image.h" +#include "url/url_util.h" using content::UserMetricsAction; using predictors::AutocompleteActionPredictor; diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h index f4a8aa6..4f9ab53 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.h +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h @@ -16,9 +16,9 @@ #include "chrome/common/metrics/proto/omnibox_event.pb.h" #include "chrome/common/omnibox_focus_state.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" +#include "url/gurl.h" class AutocompleteController; class AutocompleteResult; diff --git a/chrome/browser/ui/protocol_dialog_delegate.h b/chrome/browser/ui/protocol_dialog_delegate.h index 81b5367..87140c1 100644 --- a/chrome/browser/ui/protocol_dialog_delegate.h +++ b/chrome/browser/ui/protocol_dialog_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_PROTOCOL_DIALOG_DELEGATE_H_ #include "base/basictypes.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // Interface implemented by objects that wish to show a dialog box Window for // handling special protocols. The window that is displayed uses this interface diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h index 4806d73..09d67e7 100644 --- a/chrome/browser/ui/search/instant_controller.h +++ b/chrome/browser/ui/search/instant_controller.h @@ -25,11 +25,11 @@ #include "chrome/common/omnibox_focus_state.h" #include "chrome/common/search_types.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" struct AutocompleteMatch; struct InstantAutocompleteResult; diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc index 00c701c..498957f 100644 --- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc @@ -27,9 +27,9 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" #include "net/dns/mock_host_resolver.h" +#include "url/gurl.h" // !!! IMPORTANT !!! // These tests are run against a mock GWS using the web-page-replay system. diff --git a/chrome/browser/ui/search/instant_page_unittest.cc b/chrome/browser/ui/search/instant_page_unittest.cc index eafd976..e7695fc 100644 --- a/chrome/browser/ui/search/instant_page_unittest.cc +++ b/chrome/browser/ui/search/instant_page_unittest.cc @@ -15,10 +15,10 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" -#include "googleurl/src/gurl.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h index 9ab18b8..9ea0853 100644 --- a/chrome/browser/ui/search/instant_test_utils.h +++ b/chrome/browser/ui/search/instant_test_utils.h @@ -18,8 +18,8 @@ #include "chrome/browser/ui/search/instant_controller.h" #include "chrome/browser/ui/search/instant_overlay_model_observer.h" #include "chrome/common/search_types.h" -#include "googleurl/src/gurl.h" #include "net/test/spawned_test_server/spawned_test_server.h" +#include "url/gurl.h" class BrowserInstantController; class InstantController; diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc index 318ae3d..241da08 100644 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h index 0c43ef1..6b01f78 100644 --- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h +++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class InfoBarService; diff --git a/chrome/browser/ui/startup/obsolete_os_infobar_delegate.h b/chrome/browser/ui/startup/obsolete_os_infobar_delegate.h index 1a654bf..f16aa8a 100644 --- a/chrome/browser/ui/startup/obsolete_os_infobar_delegate.h +++ b/chrome/browser/ui/startup/obsolete_os_infobar_delegate.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class InfoBarService; diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h index c9a5d0b..beb4f89 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.h +++ b/chrome/browser/ui/startup/startup_browser_creator.h @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/startup/startup_tab.h" #include "chrome/browser/ui/startup/startup_types.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Browser; class CommandLine; diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h index f27a18e..a5ae4585 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/startup/startup_tab.h" #include "chrome/browser/ui/startup/startup_types.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Browser; class CommandLine; diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc index 2fc1888..279ebb6 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc @@ -17,8 +17,8 @@ #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" typedef InProcessBrowserTest StartupBrowserCreatorTest; diff --git a/chrome/browser/ui/startup/startup_tab.h b/chrome/browser/ui/startup/startup_tab.h index ea8916c..c948725 100644 --- a/chrome/browser/ui/startup/startup_tab.h +++ b/chrome/browser/ui/startup/startup_tab.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // Represents tab data at startup. struct StartupTab { diff --git a/chrome/browser/ui/sync/inline_login_dialog.cc b/chrome/browser/ui/sync/inline_login_dialog.cc index bb19ca1..73c9eeb 100644 --- a/chrome/browser/ui/sync/inline_login_dialog.cc +++ b/chrome/browser/ui/sync/inline_login_dialog.cc @@ -7,8 +7,8 @@ #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/url_constants.h"
-#include "googleurl/src/gurl.h"
#include "ui/gfx/size.h"
+#include "url/gurl.h"
// static
void InlineLoginDialog::Show(Profile* profile) {
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index b614c93..e58161f 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -65,7 +65,6 @@ #include "content/public/common/password_form.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -75,6 +74,7 @@ #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.h b/chrome/browser/ui/tabs/pinned_tab_codec.h index a17078c..c6f472d 100644 --- a/chrome/browser/ui/tabs/pinned_tab_codec.h +++ b/chrome/browser/ui/tabs/pinned_tab_codec.h @@ -8,7 +8,7 @@ #include <vector> #include "chrome/browser/ui/startup/startup_tab.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; diff --git a/chrome/browser/ui/toolbar/action_box_context_menu_controller.cc b/chrome/browser/ui/toolbar/action_box_context_menu_controller.cc index f2880d9..4978c3a 100644 --- a/chrome/browser/ui/toolbar/action_box_context_menu_controller.cc +++ b/chrome/browser/ui/toolbar/action_box_context_menu_controller.cc @@ -21,11 +21,11 @@ #include "content/public/browser/page_navigator.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/models/menu_separator_types.h" #include "ui/base/window_open_disposition.h" +#include "url/gurl.h" using extensions::Extension; diff --git a/chrome/browser/ui/toolbar/toolbar_model.h b/chrome/browser/ui/toolbar/toolbar_model.h index 77ddac0..9ef715d 100644 --- a/chrome/browser/ui/toolbar/toolbar_model.h +++ b/chrome/browser/ui/toolbar/toolbar_model.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/strings/string16.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace net { class X509Certificate; diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.h b/chrome/browser/ui/toolbar/toolbar_model_impl.h index d84c3e1..39b5707 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.h +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class Profile; class ToolbarModelDelegate; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index 83923ec..da03710 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -9,10 +9,10 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h" -#include "googleurl/src/gurl.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/combobox/combobox_listener.h" +#include "url/gurl.h" class BookmarkBubbleViewObserver; class Profile; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 42c7d12..77819fe 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -20,7 +20,6 @@ #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "components/user_prefs/user_prefs.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -37,6 +36,7 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_client_view.h" +#include "url/gurl.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/conflicting_module_view_win.h b/chrome/browser/ui/views/conflicting_module_view_win.h index f525307..118010f 100644 --- a/chrome/browser/ui/views/conflicting_module_view_win.h +++ b/chrome/browser/ui/views/conflicting_module_view_win.h @@ -7,9 +7,9 @@ #include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "googleurl/src/gurl.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
+#include "url/gurl.h"
class Browser;
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 80e346f..58a8d09 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -27,7 +27,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -52,6 +51,7 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_client_view.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 785f0637..93cb343 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -10,7 +10,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "chrome/browser/ui/views/constrained_window_views.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" @@ -24,6 +23,7 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_client_view.h" +#include "url/gurl.h" using views::GridLayout; using views::Textfield; diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc index d324c4f..b808c37 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc @@ -5,10 +5,10 @@ #include "base/pickle.h" #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" #include "chrome/test/base/testing_profile.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index f4c3c20..b8ffa0c 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc @@ -17,11 +17,11 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "googleurl/src/gurl.h" #include "ui/base/base_window.h" #include "ui/gfx/screen.h" #include "ui/views/background.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index b3b031a..5a45e01 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h @@ -10,9 +10,9 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/ui/views/extensions/extension_view_views.h" #include "content/public/browser/notification_observer.h" -#include "googleurl/src/gurl.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/focus/widget_focus_manager.h" +#include "url/gurl.h" class Browser; namespace views { diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h index 2f79103..6573d09 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.h +++ b/chrome/browser/ui/views/external_protocol_dialog.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/time/time.h" -#include "googleurl/src/gurl.h" #include "ui/views/window/dialog_delegate.h" +#include "url/gurl.h" namespace content { class WebContents; diff --git a/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc index a4171d7..bc57b79 100644 --- a/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc @@ -11,10 +11,10 @@ #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "googleurl/src/gurl.h" #include "ui/base/accelerators/accelerator.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 7234942..9f14148 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -28,7 +28,6 @@ #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -44,6 +43,7 @@ #include "ui/views/widget/native_widget_win.h" #include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" +#include "url/gurl.h" #include "win8/util/win8_util.h" #pragma comment(lib, "dwmapi.lib") diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 87bb1a3..de64cf4 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -13,7 +13,6 @@ #include "chrome/browser/ui/views/frame/top_container_view.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" #include "ui/base/animation/slide_animation.h" @@ -30,6 +29,7 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" #if defined(OS_WIN) #include "ui/base/l10n/l10n_util_win.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 3c39284..133270d 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -23,7 +23,6 @@ #include "chrome/common/chrome_switches.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "grit/app_locale_settings.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" @@ -49,6 +48,7 @@ #include "ui/views/layout/fill_layout.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" #if defined(USE_AURA) #include "ui/aura/focus_manager.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index db535a3..e3f006b 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -43,7 +43,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" -#include "googleurl/src/url_util.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "skia/ext/skia_utils_win.h" @@ -72,6 +71,7 @@ #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/textfield/native_textfield_win.h" #include "ui/views/widget/widget.h" +#include "url/url_util.h" #include "win8/util/win8_util.h" #pragma comment(lib, "oleacc.lib") // Needed for accessibility support. diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc index 77be5a4..28dc908 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc @@ -8,7 +8,6 @@ #include "chrome/browser/upgrade_detector.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -20,6 +19,7 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/password_generation_bubble_view.cc b/chrome/browser/ui/views/password_generation_bubble_view.cc index cab4c79..8774f4e 100644 --- a/chrome/browser/ui/views/password_generation_bubble_view.cc +++ b/chrome/browser/ui/views/password_generation_bubble_view.cc @@ -14,7 +14,6 @@ #include "components/autofill/core/common/password_generation_util.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/render_view_host.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkPaint.h" @@ -29,6 +28,7 @@ #include "ui/views/controls/link.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/layout_constants.h" +#include "url/gurl.h" namespace { // Constants for PasswordGenerationBubbleView. diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 48ed6eb..c210480 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -12,7 +12,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/themes/theme_properties.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" @@ -33,6 +32,7 @@ #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" #if defined(USE_ASH) #include "ash/wm/property_util.h" diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h index 7a2c5e9..c1bdc13 100644 --- a/chrome/browser/ui/views/status_bubble_views.h +++ b/chrome/browser/ui/views/status_bubble_views.h @@ -11,8 +11,8 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/status_bubble.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" namespace gfx { class Point; diff --git a/chrome/browser/ui/views/tabs/tab_renderer_data.h b/chrome/browser/ui/views/tabs/tab_renderer_data.h index 27348c7..ddfe4dd6 100644 --- a/chrome/browser/ui/views/tabs/tab_renderer_data.h +++ b/chrome/browser/ui/views/tabs/tab_renderer_data.h @@ -8,8 +8,8 @@ #include "base/process_util.h" #include "base/strings/string16.h" #include "chrome/browser/ui/views/chrome_views_export.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/image/image_skia.h" +#include "url/gurl.h" // Wraps the state needed by the renderers. struct CHROME_VIEWS_EXPORT TabRendererData { diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index b2cc59f..f7bee8f 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -18,7 +18,6 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/cert_store.h" #include "content/public/browser/user_metrics.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -45,6 +44,7 @@ #include "ui/views/layout/layout_manager.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index b83cbd5..d24c6ac 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -27,7 +27,6 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" -#include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -35,6 +34,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_family.h" #include "ui/gfx/image/image_skia.h" +#include "url/gurl.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) #include "base/environment.h" diff --git a/chrome/browser/ui/website_settings/permission_menu_model.h b/chrome/browser/ui/website_settings/permission_menu_model.h index cb6537e..9500aa1 100644 --- a/chrome/browser/ui/website_settings/permission_menu_model.h +++ b/chrome/browser/ui/website_settings/permission_menu_model.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_MENU_MODEL_H_ #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_MENU_MODEL_H_ -#include "ui/base/models/simple_menu_model.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "googleurl/src/gurl.h" +#include "ui/base/models/simple_menu_model.h" +#include "url/gurl.h" class PermissionMenuModel : public ui::SimpleMenuModel, public ui::SimpleMenuModel::Delegate { diff --git a/chrome/browser/ui/website_settings/website_settings.h b/chrome/browser/ui/website_settings/website_settings.h index 89712b4..b31d6e1 100644 --- a/chrome/browser/ui/website_settings/website_settings.h +++ b/chrome/browser/ui/website_settings/website_settings.h @@ -13,8 +13,8 @@ #include "chrome/browser/history/history_service.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" +#include "url/gurl.h" namespace content { class CertStore; diff --git a/chrome/browser/ui/website_settings/website_settings_utils.cc b/chrome/browser/ui/website_settings/website_settings_utils.cc index a2b7a02..f2c633b 100644 --- a/chrome/browser/ui/website_settings/website_settings_utils.cc +++ b/chrome/browser/ui/website_settings/website_settings_utils.cc @@ -6,7 +6,7 @@ #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // Returns true if the passed |url| refers to an internal chrome page. bool InternalChromePage(const GURL& url) { diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 6c1765f..864eb3f 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -48,7 +48,6 @@ #include "content/public/common/content_client.h" #include "content/public/common/process_type.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -63,6 +62,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/webui/jstemplate_builder.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" #if defined(ENABLE_THEMES) #include "chrome/browser/ui/webui/theme_source.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 4bcecf7..e918829 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -60,9 +60,9 @@ #include "content/public/common/content_client.h" #include "content/public/common/url_utils.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/favicon_size.h" #include "ui/web_dialogs/web_dialog_ui.h" +#include "url/gurl.h" #if !defined(DISABLE_NACL) #include "chrome/browser/ui/webui/nacl_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index e7eeda53..834a9d0 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -17,11 +17,11 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" +#include "url/gurl.h" namespace chromeos { namespace imageburner { diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc index 43b770b..7eb604a 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc @@ -14,10 +14,10 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/data_url.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index a6c5c9d..3e5a5d6 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -33,7 +33,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -42,6 +41,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/webui/jstemplate_builder.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using chromeos::CellularNetwork; using chromeos::CrosLibrary; diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index cebe5b9..827b4ed 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -21,11 +21,11 @@ #include "chromeos/chromeos_switches.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index c9de20f..2af46db 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -26,7 +26,6 @@ #include "chrome/common/url_constants.h" #include "content/public/child/image_decoder_utils.h" #include "extensions/common/extension_resource.h" -#include "googleurl/src/gurl.h" #include "grit/component_extension_resources_map.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" @@ -37,6 +36,7 @@ #include "ui/gfx/favicon_size.h" #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.h b/chrome/browser/ui/webui/extensions/extension_info_ui.h index fd54e31..37843c5 100644 --- a/chrome/browser/ui/webui/extensions/extension_info_ui.h +++ b/chrome/browser/ui/webui/extensions/extension_info_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_INFO_UI_H_ #include "content/public/browser/web_ui_controller.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index 0324406..8dca7d8 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h @@ -23,8 +23,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "ui/shell_dialogs/select_file_dialog.h" +#include "url/gurl.h" class ExtensionService; diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 9d7cdab..9e056d0 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -14,7 +14,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/common/time_format.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -22,6 +21,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 486e28e..aacd04b 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -25,7 +25,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -39,6 +38,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using content::BrowserThread; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc b/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc index 5099727..10d4582 100644 --- a/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc +++ b/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc @@ -13,8 +13,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" class PartnerBookmarksShimTest : public testing::Test { public: diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 82c0078..4e79a4c 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -49,13 +49,13 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" #include "content/public/common/favicon_url.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/favicon_size.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using chrome::AppLaunchParams; using chrome::OpenApplication; diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index 954a875a..4acb0c0 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc @@ -6,7 +6,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/web_ui_browsertest.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class MostVisitedWebUITest : public WebUIBrowserTest { public: diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index 5574ceb..e6f5966 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -42,11 +42,11 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc index af1b8c2..b64bdad 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc @@ -15,8 +15,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" +#include "url/gurl.h" using ::testing::_; diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 6a7f072..b64eace 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc @@ -16,7 +16,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::OpenURLParams; using content::Referrer; diff --git a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc index 661e39e..4f2552b 100644 --- a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc @@ -34,7 +34,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc index a1767d7..f9321a5 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc @@ -14,10 +14,10 @@ #include "chrome/browser/thumbnails/thumbnail_service.h" #include "chrome/browser/thumbnails/thumbnail_service_factory.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "net/url_request/url_request.h" #include "ui/base/resource/resource_bundle.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index 2de2418..daea354 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -28,7 +28,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/data_url.h" @@ -36,6 +35,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/views/widget/widget.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc index 24140bd..47133ee 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc @@ -10,11 +10,11 @@ #include "chrome/browser/chromeos/login/default_user_images.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/url_parse.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/codec/png_codec.h" #include "ui/webui/web_ui_util.h" +#include "url/url_parse.h" namespace { diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index e063533..20b6ac3 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -23,12 +23,12 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index da6b08d..e8cd583 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -28,9 +28,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" #if defined(OS_CHROMEOS) #include "base/strings/stringprintf.h" diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc index 2d8193f..2ef1ec3 100644 --- a/chrome/browser/ui/webui/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc @@ -17,12 +17,12 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using testing::AnyNumber; using testing::Return; diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h index a559782..0c70a45 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h @@ -9,7 +9,7 @@ #include <string> #include "base/time/time.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/common/quota/quota_types.h" namespace base { diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index f416fc7..f4414f8 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -23,8 +23,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/url_canon.h" -#include "googleurl/src/url_util.h" +#include "url/url_canon.h" +#include "url/url_util.h" #if defined(USE_ASH) #include "ash/shell.h" diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 8222132..5c7f8c6 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -17,11 +17,11 @@ #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc index c469d18..d6064fe 100644 --- a/chrome/browser/ui/webui/version_handler.cc +++ b/chrome/browser/ui/webui/version_handler.cc @@ -14,9 +14,9 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" #include "webkit/plugins/plugin_constants.h" namespace { diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 9749e76..2caef65 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc @@ -19,10 +19,10 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" #include "content/public/test/web_contents_tester.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" using content::OpenURLParams; using content::Referrer; |