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

BUG=229660
TBR=thestig@chromium.org

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

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

21 files changed, 23 insertions, 22 deletions

diff --git a/DEPS b/DEPS
index 9210b73..f1ea029 100644
--- a/DEPS
+++ b/DEPS
@@ -514,6 +514,7 @@ include_rules = [
 
   "+testing",
   "+third_party/icu/public",
+  "+url",
 ]
 
 
diff --git a/ui/base/dragdrop/cocoa_dnd_util.mm b/ui/base/dragdrop/cocoa_dnd_util.mm
index 83a1331..bd63980 100644
--- a/ui/base/dragdrop/cocoa_dnd_util.mm
+++ b/ui/base/dragdrop/cocoa_dnd_util.mm
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc
index 7ae028f..891a6496 100644
--- a/ui/base/dragdrop/drag_utils.cc
+++ b/ui/base/dragdrop/drag_utils.cc
@@ -7,7 +7,6 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -15,6 +14,7 @@
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
+#include "url/gurl.h"
 
 namespace drag_utils {
 
diff --git a/ui/base/dragdrop/gtk_dnd_util.cc b/ui/base/dragdrop/gtk_dnd_util.cc
index 77e9a97..899758b 100644
--- a/ui/base/dragdrop/gtk_dnd_util.cc
+++ b/ui/base/dragdrop/gtk_dnd_util.cc
@@ -9,15 +9,15 @@
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "ui/base/clipboard/custom_data_helper.h"
-
-static const int kBitsPerByte = 8;
+#include "url/gurl.h"
 
 namespace ui {
 
 namespace {
 
+const int kBitsPerByte = 8;
+
 void AddTargetToList(GtkTargetList* targets, int target_code) {
   switch (target_code) {
     case ui::TEXT_PLAIN:
diff --git a/ui/base/dragdrop/gtk_dnd_util_unittest.cc b/ui/base/dragdrop/gtk_dnd_util_unittest.cc
index bd5e0ae..04f81ae 100644
--- a/ui/base/dragdrop/gtk_dnd_util_unittest.cc
+++ b/ui/base/dragdrop/gtk_dnd_util_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.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"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/os_exchange_data.cc b/ui/base/dragdrop/os_exchange_data.cc
index c56d306..d4ed411 100644
--- a/ui/base/dragdrop/os_exchange_data.cc
+++ b/ui/base/dragdrop/os_exchange_data.cc
@@ -5,7 +5,7 @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 
 #include "base/pickle.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h
index a9ca2e4..e734f42 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
@@ -9,10 +9,10 @@
 
 #include "base/files/file_path.h"
 #include "base/pickle.h"
-#include "googleurl/src/gurl.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/vector2d.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 2528479..f55138a 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -15,7 +15,6 @@
 #include "base/files/file_path.h"
 #include "base/message_loop/message_pump_dispatcher.h"
 #include "base/pickle.h"
-#include "googleurl/src/gurl.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/x/selection_owner.h"
 #include "ui/base/x/selection_requestor.h"
@@ -23,6 +22,7 @@
 #include "ui/base/x/x11_atom_cache.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/vector2d.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 7a6b212..c937b76 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -14,12 +14,12 @@
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_hglobal.h"
-#include "googleurl/src/gurl.h"
 #include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
index af0f2c1..4202543 100644
--- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -7,11 +7,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_hglobal.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index 6cd65a9..5a4bc96 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -21,13 +21,13 @@
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "third_party/icu/public/common/unicode/rbbi.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "ui/gfx/font.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc
index 89574abc..3c06cb5 100644
--- a/ui/base/text/text_elider_unittest.cc
+++ b/ui/base/text/text_elider_unittest.cc
@@ -11,9 +11,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/ui/keyboard/keyboard.cc b/ui/keyboard/keyboard.cc
index 9a18cb2..7825c79 100644
--- a/ui/keyboard/keyboard.cc
+++ b/ui/keyboard/keyboard.cc
@@ -9,10 +9,10 @@
 #include "base/path_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_ui_controller_factory.h"
-#include "googleurl/src/gurl.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/keyboard/keyboard_constants.h"
 #include "ui/keyboard/keyboard_ui_controller.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/ui/message_center/notifier_settings.h b/ui/message_center/notifier_settings.h
index 4b913f8..052bcb1 100644
--- a/ui/message_center/notifier_settings.h
+++ b/ui/message_center/notifier_settings.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/strings/string16.h"
-#include "googleurl/src/gurl.h"
 #include "ui/gfx/image/image.h"
 #include "ui/message_center/message_center_export.h"
+#include "url/gurl.h"
 
 namespace message_center {
 
diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc
index ccff0e9..9305a07 100644
--- a/ui/views/button_drag_utils.cc
+++ b/ui/views/button_drag_utils.cc
@@ -5,7 +5,6 @@
 #include "ui/views/button_drag_utils.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "grit/ui_resources.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
@@ -14,6 +13,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/drag_utils.h"
+#include "url/gurl.h"
 
 namespace button_drag_utils {
 
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index 2ef5e6f..12aae81 100644
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "grit/ui_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
@@ -37,6 +36,7 @@
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc
index 0a6a471..4cfc804 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc
@@ -13,10 +13,10 @@
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell_browser_context.h"
-#include "googleurl/src/gurl.h"
 #include "ui/views/examples/examples_window_with_content.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
+#include "url/gurl.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.h b/ui/web_dialogs/test/test_web_dialog_delegate.h
index b5488fb..18a73b2 100644
--- a/ui/web_dialogs/test/test_web_dialog_delegate.h
+++ b/ui/web_dialogs/test/test_web_dialog_delegate.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "googleurl/src/gurl.h"
 #include "ui/gfx/size.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
+#include "url/gurl.h"
 
 namespace ui {
 namespace test {
diff --git a/ui/web_dialogs/web_dialog_ui.h b/ui/web_dialogs/web_dialog_ui.h
index 746ac7d..99dce4f 100644
--- a/ui/web_dialogs/web_dialog_ui.h
+++ b/ui/web_dialogs/web_dialog_ui.h
@@ -12,9 +12,9 @@
 #include "base/strings/string16.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_ui_controller.h"
-#include "googleurl/src/gurl.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/web_dialogs/web_dialogs_export.h"
+#include "url/gurl.h"
 
 namespace content {
 class WebContents;
diff --git a/ui/webui/web_ui_util.cc b/ui/webui/web_ui_util.cc
index 4225514..44108f7 100644
--- a/ui/webui/web_ui_util.cc
+++ b/ui/webui/web_ui_util.cc
@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_number_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "grit/app_locale_settings.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -21,6 +20,7 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
+#include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
diff --git a/ui/webui/web_ui_util_unittest.cc b/ui/webui/web_ui_util_unittest.cc
index 68bcac5..56494c9 100644
--- a/ui/webui/web_ui_util_unittest.cc
+++ b/ui/webui/web_ui_util_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "ui/webui/web_ui_util.h"
 
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 TEST(WebUIUtilTest, ParsePathAndScale) {
   std::vector<ui::ScaleFactor> supported_scale_factors;