components: Migrate from googleurl/ includes to url/ ones. Part 3.

components: Migrate from googleurl/ includes to url/ ones. Part 3.

BUG=229660
[email protected]

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210272

[tfarina, 2013-07-05 04:07:35]

TBRing...

[commit-bot: I haz the power, 2013-07-05 04:07:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/18739002/1

[commit-bot: I haz the power, 2013-07-05 07:15:30]

Change committed as 210272

[Jói, 2013-07-05 13:44:03]

LGTM

On Fri, Jul 5, 2013 at 4:07 AM,  <[email protected]> wrote:
> Reviewers: Jói,
>
> Message:
> TBRing...
>
> Description:
> components: Migrate from googleurl/ includes to url/ ones. Part 3.
>
> BUG=229660
> [email protected]
>
> Please review this at https://codereview.chromium.org/18739002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>   M components/autofill/content/browser/autocheckout/whitelist_manager.cc
>   M
>
components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
>   M components/autofill/content/browser/autocheckout_manager.cc
>   M components/autofill/content/browser/autocheckout_request_manager.h
>   M components/autofill/content/browser/wallet/encryption_escrow_client.cc
>   M components/autofill/content/browser/wallet/wallet_client.h
>   M components/autofill/content/browser/wallet/wallet_client_unittest.cc
>   M components/autofill/content/browser/wallet/wallet_items.h
>   M components/autofill/content/browser/wallet/wallet_items.cc
>   M components/autofill/content/browser/wallet/wallet_items_unittest.cc
>   M components/autofill/content/browser/wallet/wallet_service_url.cc
>   M
> components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
>   M components/autofill/content/renderer/password_generation_manager.h
>   M components/autofill/core/browser/autofill_data_model.cc
>   M components/autofill/core/browser/autofill_download.cc
>   M components/autofill/core/browser/autofill_download_url.cc
>   M components/autofill/core/browser/autofill_download_url_unittest.cc
>   M components/autofill/core/browser/autofill_manager.cc
>   M components/autofill/core/browser/autofill_manager_unittest.cc
>   M components/autofill/core/browser/autofill_merge_unittest.cc
>   M components/autofill/core/browser/autofill_metrics_unittest.cc
>   M components/autofill/core/browser/form_structure.h
>   M components/autofill/core/browser/form_structure_unittest.cc
>   M components/autofill/core/browser/webdata/autofill_table.cc
>   M components/autofill/core/common/autofill_messages.h
>   M components/autofill/core/common/form_data.h
>   M components/navigation_interception/intercept_navigation_delegate.cc
>   M components/navigation_interception/navigation_params.h
>   M components/sessions/serialized_navigation_entry.h
>   M components/sessions/serialized_navigation_entry_test_helper.cc
>   M components/sessions/serialized_navigation_entry_unittest.cc
>   M components/visitedlink/browser/visitedlink_master.cc
>   M components/visitedlink/common/visitedlink_common.cc
>   M components/visitedlink/test/visitedlink_perftest.cc
>   M components/visitedlink/test/visitedlink_unittest.cc
>   M
> components/web_contents_delegate_android/web_contents_delegate_android.cc
>
>
> Index: components/autofill/content/browser/autocheckout/whitelist_manager.cc
> diff --git
> a/components/autofill/content/browser/autocheckout/whitelist_manager.cc
> b/components/autofill/content/browser/autocheckout/whitelist_manager.cc
> index
>
55506f8f986ced1618ec7181a19d4dc82cd76ba2..59f4e7af2d2e2198de36bbf3defeeab3ec0e9721
> 100644
> --- a/components/autofill/content/browser/autocheckout/whitelist_manager.cc
> +++ b/components/autofill/content/browser/autocheckout/whitelist_manager.cc
> @@ -12,11 +12,11 @@
>  #include "base/strings/string_util.h"
>  #include "components/autofill/core/common/autofill_switches.h"
>  #include "content/public/browser/browser_context.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_context_getter.h"
> +#include "url/gurl.h"
>
>  namespace {
>
> Index:
>
components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
> diff --git
>
a/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
>
b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
> index
>
68eb2af6f0cdaaef9d0bad9e2a66c30c6c918776..ebbbecd991c3afca0e0ae06ff29bf9c4066ed638
> 100644
> ---
>
a/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
> +++
>
b/components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc
> @@ -9,7 +9,6 @@
>  #include "components/autofill/core/browser/autofill_metrics.h"
>  #include "components/autofill/core/common/autofill_switches.h"
>  #include "content/public/test/test_browser_thread_bundle.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/base/net_errors.h"
>  #include "net/http/http_status_code.h"
>  #include "net/url_request/test_url_fetcher_factory.h"
> @@ -17,6 +16,7 @@
>  #include "net/url_request/url_request_status.h"
>  #include "testing/gmock/include/gmock/gmock.h"
>  #include "testing/gtest/include/gtest/gtest.h"
> +#include "url/gurl.h"
>
>  namespace {
>
> Index: components/autofill/content/browser/autocheckout_manager.cc
> diff --git a/components/autofill/content/browser/autocheckout_manager.cc
> b/components/autofill/content/browser/autocheckout_manager.cc
> index
>
33d44cca95d955bb0974eb1fcff67477bcb4659d..79b373342f51c4f71a302e8143f77f785dc95922
> 100644
> --- a/components/autofill/content/browser/autocheckout_manager.cc
> +++ b/components/autofill/content/browser/autocheckout_manager.cc
> @@ -27,12 +27,12 @@
>  #include "content/public/browser/render_view_host.h"
>  #include "content/public/browser/web_contents.h"
>  #include "content/public/common/ssl_status.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/cookies/cookie_options.h"
>  #include "net/cookies/cookie_store.h"
>  #include "net/url_request/url_request_context.h"
>  #include "net/url_request/url_request_context_getter.h"
>  #include "ui/gfx/rect.h"
> +#include "url/gurl.h"
>
>  using content::RenderViewHost;
>  using content::SSLStatus;
> Index: components/autofill/content/browser/autocheckout_request_manager.h
> diff --git
> a/components/autofill/content/browser/autocheckout_request_manager.h
> b/components/autofill/content/browser/autocheckout_request_manager.h
> index
>
a1156996ec68a301e583748a5377cc51a6217c5c..30c4229ef0476e54092831517ae41eb0cc1b3478
> 100644
> --- a/components/autofill/content/browser/autocheckout_request_manager.h
> +++ b/components/autofill/content/browser/autocheckout_request_manager.h
> @@ -11,7 +11,7 @@
>  #include
> "components/autofill/content/browser/wallet/wallet_client_delegate.h"
>  #include "components/autofill/core/browser/autofill_metrics.h"
>  #include "components/autofill/core/common/autocheckout_status.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  namespace content {
>  class BrowserContext;
> Index:
> components/autofill/content/browser/wallet/encryption_escrow_client.cc
> diff --git
> a/components/autofill/content/browser/wallet/encryption_escrow_client.cc
> b/components/autofill/content/browser/wallet/encryption_escrow_client.cc
> index
>
3f6f228a47d30b02f087bba3535a03c73cb51d2f..e2186a8a74f838c0cfcf1cfea1ad70de59f9bf33
> 100644
> --- a/components/autofill/content/browser/wallet/encryption_escrow_client.cc
> +++ b/components/autofill/content/browser/wallet/encryption_escrow_client.cc
> @@ -13,11 +13,11 @@
>  #include
>
"components/autofill/content/browser/wallet/encryption_escrow_client_observer.h"
>  #include "components/autofill/content/browser/wallet/instrument.h"
>  #include "components/autofill/content/browser/wallet/wallet_service_url.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/base/escape.h"
>  #include "net/http/http_status_code.h"
>  #include "net/url_request/url_fetcher.h"
>  #include "net/url_request/url_request_context_getter.h"
> +#include "url/gurl.h"
>
>  namespace {
>
> Index: components/autofill/content/browser/wallet/wallet_client.h
> diff --git a/components/autofill/content/browser/wallet/wallet_client.h
> b/components/autofill/content/browser/wallet/wallet_client.h
> index
>
a76eba40d10ff61ec1b197a631c7391730e00c00..dc4b3512f6d07f951503695a25189112b857dea7
> 100644
> --- a/components/autofill/content/browser/wallet/wallet_client.h
> +++ b/components/autofill/content/browser/wallet/wallet_client.h
> @@ -21,9 +21,9 @@
>  #include "components/autofill/core/browser/autofill_manager_delegate.h"
>  #include "components/autofill/core/browser/autofill_metrics.h"
>  #include "components/autofill/core/common/autocheckout_status.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/url_request/url_fetcher_delegate.h"
>  #include "testing/gtest/include/gtest/gtest_prod.h"
> +#include "url/gurl.h"
>
>  namespace net {
>  class URLFetcher;
> Index: components/autofill/content/browser/wallet/wallet_client_unittest.cc
> diff --git
> a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
> b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
> index
>
0379cc9aa4686999f8089b9ab9a3ce49fa94b4df..8198b00109a64598bf598eb367e99399d6db5288
> 100644
> --- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
> +++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
> @@ -20,7 +20,6 @@
>  #include "components/autofill/core/common/autocheckout_status.h"
>  #include "content/public/test/test_browser_context.h"
>  #include "content/public/test/test_browser_thread.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/base/net_errors.h"
>  #include "net/http/http_status_code.h"
>  #include "net/url_request/test_url_fetcher_factory.h"
> @@ -28,6 +27,7 @@
>  #include "net/url_request/url_request_status.h"
>  #include "testing/gmock/include/gmock/gmock.h"
>  #include "testing/gtest/include/gtest/gtest.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>  namespace wallet {
> Index: components/autofill/content/browser/wallet/wallet_items.cc
> diff --git a/components/autofill/content/browser/wallet/wallet_items.cc
> b/components/autofill/content/browser/wallet/wallet_items.cc
> index
>
30317ac30c3c9a7e51318a8d4d8d8b362d23392f..1643461877d86793458d9ca5ffff92c593398b1d
> 100644
> --- a/components/autofill/content/browser/wallet/wallet_items.cc
> +++ b/components/autofill/content/browser/wallet/wallet_items.cc
> @@ -10,12 +10,12 @@
>  #include "base/values.h"
>  #include "components/autofill/core/browser/autofill_type.h"
>  #include "components/autofill/core/browser/credit_card.h"
> -#include "googleurl/src/gurl.h"
>  #include "grit/component_strings.h"
>  #include "grit/webkit_resources.h"
>  #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 autofill {
>  namespace wallet {
> Index: components/autofill/content/browser/wallet/wallet_items.h
> diff --git a/components/autofill/content/browser/wallet/wallet_items.h
> b/components/autofill/content/browser/wallet/wallet_items.h
> index
>
6d5cff915356b8b3ce6834e53b631f28371e9491..96cc2d9923539c7eaf20614cdcd0b8b37cced603
> 100644
> --- a/components/autofill/content/browser/wallet/wallet_items.h
> +++ b/components/autofill/content/browser/wallet/wallet_items.h
> @@ -16,7 +16,7 @@
>  #include "base/strings/string16.h"
>  #include "components/autofill/content/browser/wallet/required_action.h"
>  #include "components/autofill/content/browser/wallet/wallet_address.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  namespace base {
>  class DictionaryValue;
> Index: components/autofill/content/browser/wallet/wallet_items_unittest.cc
> diff --git
> a/components/autofill/content/browser/wallet/wallet_items_unittest.cc
> b/components/autofill/content/browser/wallet/wallet_items_unittest.cc
> index
>
7bdf9d0736b21892d93b1e0d88bd7117e6544328..83f8b1939fcf39f4b2819be15d21adfee237df15
> 100644
> --- a/components/autofill/content/browser/wallet/wallet_items_unittest.cc
> +++ b/components/autofill/content/browser/wallet/wallet_items_unittest.cc
> @@ -9,8 +9,8 @@
>  #include "base/values.h"
>  #include "components/autofill/content/browser/wallet/required_action.h"
>  #include "components/autofill/content/browser/wallet/wallet_items.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
> +#include "url/gurl.h"
>
>  namespace {
>
> Index: components/autofill/content/browser/wallet/wallet_service_url.cc
> diff --git
> a/components/autofill/content/browser/wallet/wallet_service_url.cc
> b/components/autofill/content/browser/wallet/wallet_service_url.cc
> index
>
7bad0197a00c4a2c0480462a6681dd37b0713ca9..a0c4e080f9269b131c40a81aee6a003844eb92fa
> 100644
> --- a/components/autofill/content/browser/wallet/wallet_service_url.cc
> +++ b/components/autofill/content/browser/wallet/wallet_service_url.cc
> @@ -10,8 +10,8 @@
>  #include "base/metrics/field_trial.h"
>  #include "components/autofill/core/common/autofill_switches.h"
>  #include "google_apis/gaia/gaia_urls.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/base/url_util.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>  namespace {
> Index:
> components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
> diff --git
> a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
> b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
> index
>
3f96504aa37aca5afb04daca54295b0e0a229527..be56057e7768a7fe957016df28b01bfe072fbb6e
> 100644
> ---
> a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
> +++
> b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
> @@ -5,8 +5,8 @@
>  #include "base/command_line.h"
>  #include "components/autofill/content/browser/wallet/wallet_service_url.h"
>  #include "components/autofill/core/common/autofill_switches.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>  namespace wallet {
> Index: components/autofill/content/renderer/password_generation_manager.h
> diff --git
> a/components/autofill/content/renderer/password_generation_manager.h
> b/components/autofill/content/renderer/password_generation_manager.h
> index
>
2092c45d844671e3f63ad191d29b348aebbcad7d..4504adb6801cc0d0671edc48fa7b0217b2ba743a
> 100644
> --- a/components/autofill/content/renderer/password_generation_manager.h
> +++ b/components/autofill/content/renderer/password_generation_manager.h
> @@ -10,9 +10,9 @@
>  #include <vector>
>
>  #include "content/public/renderer/render_view_observer.h"
> -#include "googleurl/src/gurl.h"
>  #include "third_party/WebKit/public/web/WebInputElement.h"
>  #include "third_party/WebKit/public/web/WebTextFieldDecoratorClient.h"
> +#include "url/gurl.h"
>
>  namespace WebKit {
>  class WebCString;
> Index: components/autofill/core/browser/autofill_data_model.cc
> diff --git a/components/autofill/core/browser/autofill_data_model.cc
> b/components/autofill/core/browser/autofill_data_model.cc
> index
>
5ea548a91a3bd565e318ef928bd85a88416b974e..0aa0f30b4b3019ea17e4a2289e57226396fa4128
> 100644
> --- a/components/autofill/core/browser/autofill_data_model.cc
> +++ b/components/autofill/core/browser/autofill_data_model.cc
> @@ -14,9 +14,9 @@
>  #include "components/autofill/core/browser/state_names.h"
>  #include "components/autofill/core/browser/validation.h"
>  #include "components/autofill/core/common/form_field_data.h"
> -#include "googleurl/src/gurl.h"
>  #include "grit/component_strings.h"
>  #include "ui/base/l10n/l10n_util.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>  namespace {
> Index: components/autofill/core/browser/autofill_download.cc
> diff --git a/components/autofill/core/browser/autofill_download.cc
> b/components/autofill/core/browser/autofill_download.cc
> index
>
a613315d39ce0c2d390268798200f487b4a22d2b..c189596abbbeeb1eb9a57c9c2ea670d838b07acd
> 100644
> --- a/components/autofill/core/browser/autofill_download.cc
> +++ b/components/autofill/core/browser/autofill_download.cc
> @@ -20,11 +20,11 @@
>  #include "components/autofill/core/common/autofill_pref_names.h"
>  #include "components/user_prefs/user_prefs.h"
>  #include "content/public/browser/browser_context.h"
> -#include "googleurl/src/gurl.h"
>  #include "net/base/load_flags.h"
>  #include "net/http/http_response_headers.h"
>  #include "net/url_request/url_fetcher.h"
>  #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
> +#include "url/gurl.h"
>
>  using content::BrowserContext;
>
> Index: components/autofill/core/browser/autofill_download_url.cc
> diff --git a/components/autofill/core/browser/autofill_download_url.cc
> b/components/autofill/core/browser/autofill_download_url.cc
> index
>
89984c2aff84420378afc93444b2c1f877c6d81d..657e69e9ee4a0ae321d1d5b52728c3d3e783b2c8
> 100644
> --- a/components/autofill/core/browser/autofill_download_url.cc
> +++ b/components/autofill/core/browser/autofill_download_url.cc
> @@ -8,7 +8,7 @@
>
>  #include "base/command_line.h"
>  #include "components/autofill/core/common/autofill_switches.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>  namespace {
> Index: components/autofill/core/browser/autofill_download_url_unittest.cc
> diff --git
> a/components/autofill/core/browser/autofill_download_url_unittest.cc
> b/components/autofill/core/browser/autofill_download_url_unittest.cc
> index
>
d48c1f6b9ee448c328917c63a6cc4807992db859..123ec6cf3e73abb368bdfea9c53c452a0b6858e3
> 100644
> --- a/components/autofill/core/browser/autofill_download_url_unittest.cc
> +++ b/components/autofill/core/browser/autofill_download_url_unittest.cc
> @@ -3,9 +3,9 @@
>  // found in the LICENSE file.
>
>  #include "components/autofill/core/browser/autofill_download_url.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::StartsWith;
>
> Index: components/autofill/core/browser/autofill_manager.cc
> diff --git a/components/autofill/core/browser/autofill_manager.cc
> b/components/autofill/core/browser/autofill_manager.cc
> index
>
7a1d925d81ffa0e45bddc86ee904a7667a55ac2e..da6d0b2c43f84043b49353fad06cacc1990f0a95
> 100644
> --- a/components/autofill/core/browser/autofill_manager.cc
> +++ b/components/autofill/core/browser/autofill_manager.cc
> @@ -51,11 +51,11 @@
>  #include "content/public/browser/web_contents.h"
>  #include "content/public/browser/web_contents_view.h"
>  #include "content/public/common/url_constants.h"
> -#include "googleurl/src/gurl.h"
>  #include "grit/component_strings.h"
>  #include "third_party/WebKit/public/web/WebAutofillClient.h"
>  #include "ui/base/l10n/l10n_util.h"
>  #include "ui/gfx/rect.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>
> Index: components/autofill/core/browser/autofill_manager_unittest.cc
> diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc
> b/components/autofill/core/browser/autofill_manager_unittest.cc
> index
>
d543ab60d63ce121f8a5fc31eca5a1bb119a52ea..f983c332c2a8ed2856ab6eaaeb3edff961559656
> 100644
> --- a/components/autofill/core/browser/autofill_manager_unittest.cc
> +++ b/components/autofill/core/browser/autofill_manager_unittest.cc
> @@ -44,7 +44,6 @@
>  #include "content/public/browser/web_contents.h"
>  #include "content/public/test/mock_render_process_host.h"
>  #include "content/public/test/test_utils.h"
> -#include "googleurl/src/gurl.h"
>  #include "grit/component_strings.h"
>  #include "ipc/ipc_test_sink.h"
>  #include "testing/gmock/include/gmock/gmock.h"
> @@ -53,6 +52,7 @@
>  #include "third_party/WebKit/public/web/WebFormElement.h"
>  #include "ui/base/l10n/l10n_util.h"
>  #include "ui/gfx/rect.h"
> +#include "url/gurl.h"
>
>  using content::WebContents;
>  using testing::_;
> Index: components/autofill/core/browser/autofill_merge_unittest.cc
> diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc
> b/components/autofill/core/browser/autofill_merge_unittest.cc
> index
>
07eda326e90ce3b3651f3915266e44431cb14f4c..b83d70360f22e30014e5bc8816b282c8ca3aef6a
> 100644
> --- a/components/autofill/core/browser/autofill_merge_unittest.cc
> +++ b/components/autofill/core/browser/autofill_merge_unittest.cc
> @@ -14,9 +14,9 @@
>  #include "components/autofill/core/browser/form_structure.h"
>  #include "components/autofill/core/browser/personal_data_manager.h"
>  #include "components/autofill/core/common/form_data.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
>  #include "third_party/WebKit/public/web/WebInputElement.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>
> Index: components/autofill/core/browser/autofill_metrics_unittest.cc
> diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc
> b/components/autofill/core/browser/autofill_metrics_unittest.cc
> index
>
df38681bb481e22d3bc270fcccf33efffd59155c..b4cc1b170fdc78cabd1ac38e7720ed07832009d2
> 100644
> --- a/components/autofill/core/browser/autofill_metrics_unittest.cc
> +++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
> @@ -26,10 +26,10 @@
>  #include "components/autofill/core/common/forms_seen_state.h"
>  #include "components/webdata/common/web_data_results.h"
>  #include "content/public/test/test_utils.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 base::TimeDelta;
>  using base::TimeTicks;
> Index: components/autofill/core/browser/form_structure.h
> diff --git a/components/autofill/core/browser/form_structure.h
> b/components/autofill/core/browser/form_structure.h
> index
>
23e21ba6cc08f031edfd4aadcc54e349c827a5b2..bfb2c5bb2bbc93085318b1c4bbaa4bcab95d780b
> 100644
> --- a/components/autofill/core/browser/form_structure.h
> +++ b/components/autofill/core/browser/form_structure.h
> @@ -15,7 +15,7 @@
>  #include "components/autofill/core/browser/autofill_type.h"
>  #include "components/autofill/core/browser/field_types.h"
>  #include "components/autofill/core/common/web_element_descriptor.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  enum RequestMethod {
>    GET,
> Index: components/autofill/core/browser/form_structure_unittest.cc
> diff --git a/components/autofill/core/browser/form_structure_unittest.cc
> b/components/autofill/core/browser/form_structure_unittest.cc
> index
>
20bdd0aba3fa7b3b69dd4b493764fe482b62cd32..995cfd3d1446f793555f058b8512451ddc1442b5
> 100644
> --- a/components/autofill/core/browser/form_structure_unittest.cc
> +++ b/components/autofill/core/browser/form_structure_unittest.cc
> @@ -11,9 +11,9 @@
>  #include "components/autofill/core/browser/autofill_metrics.h"
>  #include "components/autofill/core/common/form_data.h"
>  #include "components/autofill/core/common/form_field_data.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
>  #include "third_party/WebKit/public/web/WebInputElement.h"
> +#include "url/gurl.h"
>
>  using WebKit::WebInputElement;
>
> Index: components/autofill/core/browser/webdata/autofill_table.cc
> diff --git a/components/autofill/core/browser/webdata/autofill_table.cc
> b/components/autofill/core/browser/webdata/autofill_table.cc
> index
>
c1c6bf994675de6a5bd10bc50beacad74b8a5de6..07955b29ce45d754ec5b736b3ec430fba0955fc3
> 100644
> --- a/components/autofill/core/browser/webdata/autofill_table.cc
> +++ b/components/autofill/core/browser/webdata/autofill_table.cc
> @@ -27,10 +27,10 @@
>  #include "components/autofill/core/common/form_field_data.h"
>  #include "components/webdata/common/web_database.h"
>  #include "components/webdata/encryptor/encryptor.h"
> -#include "googleurl/src/gurl.h"
>  #include "sql/statement.h"
>  #include "sql/transaction.h"
>  #include "ui/base/l10n/l10n_util.h"
> +#include "url/gurl.h"
>
>  using base::Time;
>
> Index: components/autofill/core/common/autofill_messages.h
> diff --git a/components/autofill/core/common/autofill_messages.h
> b/components/autofill/core/common/autofill_messages.h
> index
>
d504855803bacdb38a3c5c1265798df03d2af39b..0925289239b47247281dfe805c7dad7f96c4bb2c
> 100644
> --- a/components/autofill/core/common/autofill_messages.h
> +++ b/components/autofill/core/common/autofill_messages.h
> @@ -19,11 +19,11 @@
>  #include "content/public/common/common_param_traits_macros.h"
>  #include "content/public/common/password_form.h"
>  #include "content/public/common/ssl_status.h"
> -#include "googleurl/src/gurl.h"
>  #include "ipc/ipc_message_macros.h"
>  #include "ipc/ipc_message_utils.h"
>  #include "third_party/WebKit/public/web/WebFormElement.h"
>  #include "ui/gfx/rect.h"
> +#include "url/gurl.h"
>
>  #define IPC_MESSAGE_START AutofillMsgStart
>
> Index: components/autofill/core/common/form_data.h
> diff --git a/components/autofill/core/common/form_data.h
> b/components/autofill/core/common/form_data.h
> index
>
4e42d29945111c2c22d4d5672b20bf1467a06a3e..89d70bc75fc83224c9ca884464d1cede47d55560
> 100644
> --- a/components/autofill/core/common/form_data.h
> +++ b/components/autofill/core/common/form_data.h
> @@ -10,7 +10,7 @@
>  #include "base/strings/string16.h"
>  #include "components/autofill/core/common/form_field_data.h"
>  #include "content/public/common/ssl_status.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  namespace autofill {
>
> Index: components/navigation_interception/intercept_navigation_delegate.cc
> diff --git
> a/components/navigation_interception/intercept_navigation_delegate.cc
> b/components/navigation_interception/intercept_navigation_delegate.cc
> index
>
cc3feb42d13425ac0eef8e6f31f9cfcf6f460992..1cbe04c8e7ece454619cb41689f78e91959238ef
> 100644
> --- a/components/navigation_interception/intercept_navigation_delegate.cc
> +++ b/components/navigation_interception/intercept_navigation_delegate.cc
> @@ -12,9 +12,9 @@
>  #include "content/public/browser/browser_thread.h"
>  #include "content/public/browser/render_view_host.h"
>  #include "content/public/browser/web_contents.h"
> -#include "googleurl/src/gurl.h"
>  #include "jni/InterceptNavigationDelegate_jni.h"
>  #include "net/url_request/url_request.h"
> +#include "url/gurl.h"
>
>  using base::android::ConvertUTF8ToJavaString;
>  using base::android::ScopedJavaLocalRef;
> Index: components/navigation_interception/navigation_params.h
> diff --git a/components/navigation_interception/navigation_params.h
> b/components/navigation_interception/navigation_params.h
> index
>
0b0a731249249d96696d2effb837d036837a1b3a..0144a5af02396cdba0c59acc4e24ec67fb546c91
> 100644
> --- a/components/navigation_interception/navigation_params.h
> +++ b/components/navigation_interception/navigation_params.h
> @@ -8,7 +8,7 @@
>  #include "content/public/common/page_transition_types.h"
>  #include "content/public/common/page_transition_types.h"
>  #include "content/public/common/referrer.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  namespace navigation_interception {
>
> Index: components/sessions/serialized_navigation_entry.h
> diff --git a/components/sessions/serialized_navigation_entry.h
> b/components/sessions/serialized_navigation_entry.h
> index
>
18698971b6c465c28f2dd1fcae6290c72ca5096f..e5813dce0d8c98fe46b869505cdec9d245f8dda2
> 100644
> --- a/components/sessions/serialized_navigation_entry.h
> +++ b/components/sessions/serialized_navigation_entry.h
> @@ -17,7 +17,7 @@
>  #include "content/public/common/page_state.h"
>  #include "content/public/common/page_transition_types.h"
>  #include "content/public/common/referrer.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  class Pickle;
>  class PickleIterator;
> Index: components/sessions/serialized_navigation_entry_test_helper.cc
> diff --git a/components/sessions/serialized_navigation_entry_test_helper.cc
> b/components/sessions/serialized_navigation_entry_test_helper.cc
> index
>
b134a18fd8faa4f35e6b576d52135122f0a4ebdb..f4a7e2eba6a1f970d0c45b1919aca76c468c917d
> 100644
> --- a/components/sessions/serialized_navigation_entry_test_helper.cc
> +++ b/components/sessions/serialized_navigation_entry_test_helper.cc
> @@ -7,9 +7,9 @@
>  #include "base/strings/utf_string_conversions.h"
>  #include "base/time/time.h"
>  #include "components/sessions/serialized_navigation_entry.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
>  #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
> +#include "url/gurl.h"
>
>  namespace sessions {
>
> Index: components/sessions/serialized_navigation_entry_unittest.cc
> diff --git a/components/sessions/serialized_navigation_entry_unittest.cc
> b/components/sessions/serialized_navigation_entry_unittest.cc
> index
>
d76a88b7479c06809f227f59c4dc7d23e32771fd..5f052fe23e7823fa24055b130e9b895e77b519a4
> 100644
> --- a/components/sessions/serialized_navigation_entry_unittest.cc
> +++ b/components/sessions/serialized_navigation_entry_unittest.cc
> @@ -18,11 +18,11 @@
>  #include "content/public/browser/navigation_entry.h"
>  #include "content/public/common/page_transition_types.h"
>  #include "content/public/common/referrer.h"
> -#include "googleurl/src/gurl.h"
>  #include "sync/protocol/session_specifics.pb.h"
>  #include "sync/util/time.h"
>  #include "testing/gtest/include/gtest/gtest.h"
>  #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
> +#include "url/gurl.h"
>
>  namespace sessions {
>  namespace {
> Index: components/visitedlink/browser/visitedlink_master.cc
> diff --git a/components/visitedlink/browser/visitedlink_master.cc
> b/components/visitedlink/browser/visitedlink_master.cc
> index
>
f78d5c1541c8bbc46efb27871ad92ef5f14b2ef4..5839dcbac4d46d426e5be5ffb64e52b0857d3525
> 100644
> --- a/components/visitedlink/browser/visitedlink_master.cc
> +++ b/components/visitedlink/browser/visitedlink_master.cc
> @@ -28,7 +28,7 @@
>  #include "components/visitedlink/browser/visitedlink_event_listener.h"
>  #include "content/public/browser/browser_context.h"
>  #include "content/public/browser/browser_thread.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  using content::BrowserThread;
>  using file_util::ScopedFILE;
> Index: components/visitedlink/common/visitedlink_common.cc
> diff --git a/components/visitedlink/common/visitedlink_common.cc
> b/components/visitedlink/common/visitedlink_common.cc
> index
>
430f62efaa015ff6abee58fe15a4f0d1cfb8daa9..7576231bc0556de3757d94cc7cf8bafc9e29f8a4
> 100644
> --- a/components/visitedlink/common/visitedlink_common.cc
> +++ b/components/visitedlink/common/visitedlink_common.cc
> @@ -8,7 +8,7 @@
>
>  #include "base/logging.h"
>  #include "base/md5.h"
> -#include "googleurl/src/gurl.h"
> +#include "url/gurl.h"
>
>  namespace visitedlink {
>
> Index: components/visitedlink/test/visitedlink_perftest.cc
> diff --git a/components/visitedlink/test/visitedlink_perftest.cc
> b/components/visitedlink/test/visitedlink_perftest.cc
> index
>
6ebc0ebbc129f8a8eb334962f1b942bf3fc3bec0..bbe52ec4102030be3a473c8f79d41d432466234d
> 100644
> --- a/components/visitedlink/test/visitedlink_perftest.cc
> +++ b/components/visitedlink/test/visitedlink_perftest.cc
> @@ -13,8 +13,8 @@
>  #include "base/strings/stringprintf.h"
>  #include "base/test/test_file_util.h"
>  #include "components/visitedlink/browser/visitedlink_master.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
> +#include "url/gurl.h"
>
>  using base::TimeDelta;
>
> Index: components/visitedlink/test/visitedlink_unittest.cc
> diff --git a/components/visitedlink/test/visitedlink_unittest.cc
> b/components/visitedlink/test/visitedlink_unittest.cc
> index
>
ded5ef5ab2a619ef18b554070deefe33eea7b860..25b11afc647a8ac7662f46a6b4105d5e2762bf9c
> 100644
> --- a/components/visitedlink/test/visitedlink_unittest.cc
> +++ b/components/visitedlink/test/visitedlink_unittest.cc
> @@ -26,8 +26,8 @@
>  #include "content/public/test/test_browser_context.h"
>  #include "content/public/test/test_browser_thread_bundle.h"
>  #include "content/public/test/test_renderer_host.h"
> -#include "googleurl/src/gurl.h"
>  #include "testing/gtest/include/gtest/gtest.h"
> +#include "url/gurl.h"
>
>  using content::BrowserThread;
>  using content::MockRenderProcessHost;
> Index:
> components/web_contents_delegate_android/web_contents_delegate_android.cc
> diff --git
> a/components/web_contents_delegate_android/web_contents_delegate_android.cc
> b/components/web_contents_delegate_android/web_contents_delegate_android.cc
> index
>
d5cb527cf9dd3cf7f4367b9775fb9063cf9ddd38..633e52159cf11caaa254cab31b8f2502b996bd8e
> 100644
> ---
> a/components/web_contents_delegate_android/web_contents_delegate_android.cc
> +++
> b/components/web_contents_delegate_android/web_contents_delegate_android.cc
> @@ -18,10 +18,10 @@
>  #include "content/public/browser/web_contents.h"
>  #include "content/public/common/page_transition_types.h"
>  #include "content/public/common/referrer.h"
> -#include "googleurl/src/gurl.h"
>  #include "jni/WebContentsDelegateAndroid_jni.h"
>  #include "ui/base/window_open_disposition.h"
>  #include "ui/gfx/rect.h"
> +#include "url/gurl.h"
>
>  using base::android::AttachCurrentThread;
>  using base::android::ConvertUTF8ToJavaString;
>
>