diff options
| author | leng@chromium.org <leng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 01:38:52 +0000 |
|---|---|---|
| committer | leng@chromium.org <leng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 01:38:52 +0000 |
| commit | f769832754e3e67cd117cf415ba231865b32e33c (patch) | |
| tree | 36c0d0f50b707f51373a60197908769297bf746d /sync/api | |
| parent | a62cd81249440b9520d9a952a6334d266d0d7cbd (diff) | |
| download | chromium_src-f769832754e3e67cd117cf415ba231865b32e33c.zip chromium_src-f769832754e3e67cd117cf415ba231865b32e33c.tar.gz chromium_src-f769832754e3e67cd117cf415ba231865b32e33c.tar.bz2 | |
Revert of Consolidate attachment URL construction. (https://codereview.chromium.org/355093002/)
Reason for revert:
Broke compile on ChromiumOS on Linux:
../../chrome/browser/sync/profile_sync_components_factory_impl.cc: In member function 'virtual scoped_ptr<syncer::AttachmentService> ProfileSyncComponentsFactoryImpl::CreateAttachmentService(syncer::AttachmentService::Delegate*)':
../../chrome/browser/sync/profile_sync_components_factory_impl.cc:648:44: error: 'url_prefix' was not declared in this scope
ninja: build stopped: subcommand failed.
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/6230/steps/compile/logs/stdio
Original issue's description:
> Consolidate attachment URL construction.
>
> Fix bug where attachment URLs could end up with too many slashes.
>
> BUG=
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=280193
TBR=pavely@chromium.org,maniscalco@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/356953009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/api')
| -rw-r--r-- | sync/api/attachments/attachment_downloader.cc | 4 | ||||
| -rw-r--r-- | sync/api/attachments/attachment_downloader.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sync/api/attachments/attachment_downloader.cc b/sync/api/attachments/attachment_downloader.cc index 8b07ab9..7fd32cd 100644 --- a/sync/api/attachments/attachment_downloader.cc +++ b/sync/api/attachments/attachment_downloader.cc @@ -15,7 +15,7 @@ AttachmentDownloader::~AttachmentDownloader() { // It is introduced to avoid SYNC_EXPORT-ing AttachmentDownloaderImpl since it // inherits from OAuth2TokenService::Consumer which is not exported. scoped_ptr<AttachmentDownloader> AttachmentDownloader::Create( - const GURL& sync_service_url, + const std::string& url_prefix, const scoped_refptr<net::URLRequestContextGetter>& url_request_context_getter, const std::string& account_id, @@ -23,7 +23,7 @@ scoped_ptr<AttachmentDownloader> AttachmentDownloader::Create( scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider> token_service_provider) { return scoped_ptr<AttachmentDownloader>( - new AttachmentDownloaderImpl(sync_service_url, + new AttachmentDownloaderImpl(url_prefix, url_request_context_getter, account_id, scopes, diff --git a/sync/api/attachments/attachment_downloader.h b/sync/api/attachments/attachment_downloader.h index b2b2037..718284c 100644 --- a/sync/api/attachments/attachment_downloader.h +++ b/sync/api/attachments/attachment_downloader.h @@ -41,7 +41,8 @@ class SYNC_EXPORT AttachmentDownloader { const DownloadCallback& callback) = 0; // Create instance of AttachmentDownloaderImpl. - // |sync_service_url| is the URL of the sync service. + // |url_prefix| is the URL prefix (including trailing slash) to be used when + // downloading attachments. // // |url_request_context_getter| provides a URLRequestContext. // @@ -51,7 +52,7 @@ class SYNC_EXPORT AttachmentDownloader { // // |token_service_provider| provides an OAuth2 token service. static scoped_ptr<AttachmentDownloader> Create( - const GURL& sync_service_url, + const std::string& url_prefix, const scoped_refptr<net::URLRequestContextGetter>& url_request_context_getter, const std::string& account_id, |