diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 09:41:02 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 09:41:02 +0000 |
| commit | bd7026033fc1d0729b3b36819b7b6ec4b95674e9 (patch) | |
| tree | 1450d1617722ea637e21d244ceeb491d7f4d8f41 /chrome/browser/sync/test/integration | |
| parent | bb40c930f3fddbe433b2273e541da9645d128024 (diff) | |
| download | chromium_src-bd7026033fc1d0729b3b36819b7b6ec4b95674e9.zip chromium_src-bd7026033fc1d0729b3b36819b7b6ec4b95674e9.tar.gz chromium_src-bd7026033fc1d0729b3b36819b7b6ec4b95674e9.tar.bz2 | |
Clean up GaiaUrls to actually return GURLs.
It turns out that most consuming code can actually handle a GURL
return value better. Other consumers can use GURL::Resolve() which
provides nicer semantics for construction URLs that string
concatenation, which had been used before.
BUG=chromium:243889
R=akalin@chromium.org, bauerb@chromium.org, brettw@chromium.org, courage@chromium.org, isherman@chromium.org, rogerta@chromium.org, sail@chromium.org, sky@chromium.org, zelidrag@chromium.org
Review URL: https://codereview.chromium.org/23691043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/test/integration')
| -rw-r--r-- | chrome/browser/sync/test/integration/sync_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 6abf560..c1d8deb 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -426,15 +426,15 @@ void SyncTest::SetupMockGaiaResponses() { password_ = "password"; factory_.reset(new net::URLFetcherImplFactory()); fake_factory_.reset(new net::FakeURLFetcherFactory(factory_.get())); - fake_factory_->SetFakeResponse( + fake_factory_->SetFakeResponseForURL( GaiaUrls::GetInstance()->client_login_url(), "SID=sid\nLSID=lsid", true); - fake_factory_->SetFakeResponse( + fake_factory_->SetFakeResponseForURL( GaiaUrls::GetInstance()->get_user_info_url(), "email=user@gmail.com\ndisplayEmail=user@gmail.com", true); - fake_factory_->SetFakeResponse( + fake_factory_->SetFakeResponseForURL( GaiaUrls::GetInstance()->issue_auth_token_url(), "auth", true); @@ -442,11 +442,11 @@ void SyncTest::SetupMockGaiaResponses() { GoogleURLTracker::kSearchDomainCheckURL, ".google.com", true); - fake_factory_->SetFakeResponse( + fake_factory_->SetFakeResponseForURL( GaiaUrls::GetInstance()->client_login_to_oauth2_url(), "some_response", true); - fake_factory_->SetFakeResponse( + fake_factory_->SetFakeResponseForURL( GaiaUrls::GetInstance()->oauth2_token_url(), "{" " \"refresh_token\": \"rt1\"," @@ -455,7 +455,7 @@ void SyncTest::SetupMockGaiaResponses() { " \"token_type\": \"Bearer\"" "}", true); - fake_factory_->SetFakeResponse( + fake_factory_->SetFakeResponseForURL( GaiaUrls::GetInstance()->oauth1_login_url(), "SID=sid\nLSID=lsid\nAuth=auth_token", true); |