diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 20:01:40 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 20:01:40 +0000 |
commit | 79fe227571a36a13128546564e542a742ebb8523 (patch) | |
tree | f712e2e984db2e8f02da51662a148085fffc6ee2 /google_apis | |
parent | aeda9d98cc0893bbaed8f0d774d1f19a15f55e2a (diff) | |
download | chromium_src-79fe227571a36a13128546564e542a742ebb8523.zip chromium_src-79fe227571a36a13128546564e542a742ebb8523.tar.gz chromium_src-79fe227571a36a13128546564e542a742ebb8523.tar.bz2 |
Migrate from googleurl/ includes to url/ ones in the remaining top-level directories.
BUG=229660
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/18919005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r-- | google_apis/gaia/gaia_auth_fetcher.h | 2 | ||||
-rw-r--r-- | google_apis/gaia/gaia_auth_fetcher_unittest.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/gaia_auth_util.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/gaia_auth_util_unittest.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/gaia_oauth_client.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/gaia_oauth_client_unittest.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/gaia_urls.h | 2 | ||||
-rw-r--r-- | google_apis/gaia/google_service_auth_error.h | 2 | ||||
-rw-r--r-- | google_apis/gaia/oauth2_access_token_fetcher.h | 2 | ||||
-rw-r--r-- | google_apis/gaia/oauth2_access_token_fetcher_unittest.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/oauth_request_signer.cc | 2 | ||||
-rw-r--r-- | google_apis/gaia/oauth_request_signer_unittest.cc | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/google_apis/gaia/gaia_auth_fetcher.h b/google_apis/gaia/gaia_auth_fetcher.h index 84cc3e6..1c6ea37 100644 --- a/google_apis/gaia/gaia_auth_fetcher.h +++ b/google_apis/gaia/gaia_auth_fetcher.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" +#include "url/gurl.h" // Authenticate a user against the Google Accounts ClientLogin API // with various capabilities and return results to a GaiaAuthConsumer. diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc index 5cce72b..ae48b5b 100644 --- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc +++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc @@ -17,7 +17,6 @@ #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/mock_url_fetcher_factory.h" #include "google_apis/google_api_keys.h" -#include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h" @@ -27,6 +26,7 @@ #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using ::testing::_; using ::testing::Invoke; diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc index 36768e23..a8cad86 100644 --- a/google_apis/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.cc @@ -10,7 +10,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "google_apis/gaia/gaia_urls.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace gaia { diff --git a/google_apis/gaia/gaia_auth_util_unittest.cc b/google_apis/gaia/gaia_auth_util_unittest.cc index 3ce0efd..4fe58a3 100644 --- a/google_apis/gaia/gaia_auth_util_unittest.cc +++ b/google_apis/gaia/gaia_auth_util_unittest.cc @@ -4,8 +4,8 @@ #include "google_apis/gaia/gaia_auth_util.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace gaia { diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index a9ece54..86064d9 100644 --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc @@ -10,12 +10,12 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "google_apis/gaia/gaia_urls.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_fetcher_delegate.h" #include "net/url_request/url_request_context_getter.h" +#include "url/gurl.h" namespace { const char kAccessTokenValue[] = "access_token"; diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc index 921a61a..0f0b2e0 100644 --- a/google_apis/gaia/gaia_oauth_client_unittest.cc +++ b/google_apis/gaia/gaia_oauth_client_unittest.cc @@ -11,7 +11,6 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "google_apis/gaia/gaia_oauth_client.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" @@ -20,6 +19,7 @@ #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using ::testing::_; using ::testing::Eq; diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h index 34f8d86..28c7279 100644 --- a/google_apis/gaia/gaia_urls.h +++ b/google_apis/gaia/gaia_urls.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/singleton.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" // A signleton that provides all the URLs that are used for connecting to GAIA. class GaiaUrls { diff --git a/google_apis/gaia/google_service_auth_error.h b/google_apis/gaia/google_service_auth_error.h index ddfa2d0..a99e515 100644 --- a/google_apis/gaia/google_service_auth_error.h +++ b/google_apis/gaia/google_service_auth_error.h @@ -24,7 +24,7 @@ #include <string> -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { class DictionaryValue; diff --git a/google_apis/gaia/oauth2_access_token_fetcher.h b/google_apis/gaia/oauth2_access_token_fetcher.h index 24f4d85..11ac6ea 100644 --- a/google_apis/gaia/oauth2_access_token_fetcher.h +++ b/google_apis/gaia/oauth2_access_token_fetcher.h @@ -11,8 +11,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" -#include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" +#include "url/gurl.h" class OAuth2AccessTokenFetcherTest; diff --git a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc index 2d4166e..ae022f5 100644 --- a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc +++ b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc @@ -13,7 +13,6 @@ #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" #include "google_apis/gaia/oauth2_access_token_fetcher.h" -#include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" @@ -24,6 +23,7 @@ #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using content::BrowserThread; using net::ResponseCookies; diff --git a/google_apis/gaia/oauth_request_signer.cc b/google_apis/gaia/oauth_request_signer.cc index 9a82753..b16744c 100644 --- a/google_apis/gaia/oauth_request_signer.cc +++ b/google_apis/gaia/oauth_request_signer.cc @@ -20,7 +20,7 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "crypto/hmac.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace { diff --git a/google_apis/gaia/oauth_request_signer_unittest.cc b/google_apis/gaia/oauth_request_signer_unittest.cc index 40206f6..30358e0 100644 --- a/google_apis/gaia/oauth_request_signer_unittest.cc +++ b/google_apis/gaia/oauth_request_signer_unittest.cc @@ -4,8 +4,8 @@ #include "google_apis/gaia/oauth_request_signer.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" // This value is used to seed the PRNG at the beginning of a sequence of // operations to produce a repeatable sequence. |