Skip to content

Commit

Permalink
components: Migrate from googleurl/ includes to url/ ones. Part 3.
Browse files Browse the repository at this point in the history
BUG=229660
TBR=joi@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18739002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210272 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tfarina@chromium.org committed Jul 5, 2013
1 parent ac0a97d commit e3b599e
Show file tree
Hide file tree
Showing 36 changed files with 36 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
#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"
#include "net/url_request/url_fetcher_delegate.h"
#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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion components/autofill/content/browser/wallet/wallet_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
#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"
#include "net/url_request/url_fetcher_delegate.h"
#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 {
Expand Down
2 changes: 1 addition & 1 deletion components/autofill/content/browser/wallet/wallet_items.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/autofill/content/browser/wallet/wallet_items.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/browser/autofill_data_model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/browser/autofill_download.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/browser/autofill_download_url.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/browser/autofill_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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::_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/browser/form_structure.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/browser/webdata/autofill_table.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/common/autofill_messages.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion components/autofill/core/common/form_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/navigation_interception/navigation_params.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion components/sessions/serialized_navigation_entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/visitedlink/browser/visitedlink_master.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/visitedlink/common/visitedlink_common.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "base/logging.h"
#include "base/md5.h"
#include "googleurl/src/gurl.h"
#include "url/gurl.h"

namespace visitedlink {

Expand Down
2 changes: 1 addition & 1 deletion components/visitedlink/test/visitedlink_perftest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion components/visitedlink/test/visitedlink_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit e3b599e

Please sign in to comment.