Revert of Consolidate attachment URL construction.

sync/internal_api/attachments/attachment_downloader_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/public/attachments/attachment_downloader_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
-#include "sync/internal_api/public/attachments/attachment_uploader_impl.h"
 #include "sync/protocol/sync.pb.h"
 #include "url/gurl.h"
 
 namespace syncer {
 
 struct AttachmentDownloaderImpl::DownloadState {
  public:
   DownloadState(const AttachmentId& attachment_id,
                 const AttachmentUrl& attachment_url);
 
   AttachmentId attachment_id;
   AttachmentUrl attachment_url;
   // |access_token| needed to invalidate if downloading attachment fails with
   // HTTP_UNAUTHORIZED.
   std::string access_token;
   scoped_ptr<net::URLFetcher> url_fetcher;
   std::vector<DownloadCallback> user_callbacks;
 };
 
 AttachmentDownloaderImpl::DownloadState::DownloadState(
     const AttachmentId& attachment_id,
     const AttachmentUrl& attachment_url)
     : attachment_id(attachment_id), attachment_url(attachment_url) {
 }
 
 AttachmentDownloaderImpl::AttachmentDownloaderImpl(
-    const GURL& sync_service_url,
+    const std::string& url_prefix,
     const scoped_refptr<net::URLRequestContextGetter>&
         url_request_context_getter,
     const std::string& account_id,
     const OAuth2TokenService::ScopeSet& scopes,
     scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider>
         token_service_provider)
     : OAuth2TokenService::Consumer("attachment-downloader-impl"),
-      sync_service_url_(sync_service_url),
+      url_prefix_(url_prefix),
       url_request_context_getter_(url_request_context_getter),
       account_id_(account_id),
       oauth2_scopes_(scopes),
       token_service_provider_(token_service_provider.Pass()) {
   DCHECK(token_service_provider_);
   DCHECK(url_request_context_getter_);
+  DCHECK(!url_prefix_.empty());
 }
 
 AttachmentDownloaderImpl::~AttachmentDownloaderImpl() {
 }
 
 void AttachmentDownloaderImpl::DownloadAttachment(
     const AttachmentId& attachment_id,
     const DownloadCallback& callback) {
   DCHECK(CalledOnValidThread());
 
-  AttachmentUrl url = AttachmentUploaderImpl::GetURLForAttachmentId(
-                          sync_service_url_, attachment_id).spec();
+  AttachmentUrl url = GetAttachmentUrl(attachment_id);
 
   StateMap::iterator iter = state_map_.find(url);
   if (iter == state_map_.end()) {
     // There is no request started for this attachment id. Let's create
     // DownloadState and request access token for it.
     scoped_ptr<DownloadState> new_download_state(
         new DownloadState(attachment_id, url));
     iter = state_map_.add(url, new_download_state.Pass()).first;
     RequestAccessToken(iter->second);
   }
@@ skipping 69 matching lines @@
                                                oauth2_scopes_,
                                                download_state.access_token);
     // TODO(pavely): crbug/380437. This is transient error. Request new access
     // token for this DownloadState. The only trick is to do it with exponential
     // backoff.
   }
   ReportResult(download_state, result, attachment_data);
   state_map_.erase(iter);
 }
 
+AttachmentDownloaderImpl::AttachmentUrl
+AttachmentDownloaderImpl::GetAttachmentUrl(const AttachmentId& attachment_id) {
+  return url_prefix_ + attachment_id.GetProto().unique_id();
+}
+
 scoped_ptr<net::URLFetcher> AttachmentDownloaderImpl::CreateFetcher(
     const AttachmentUrl& url,
     const std::string& access_token) {
   scoped_ptr<net::URLFetcher> url_fetcher(
       net::URLFetcher::Create(GURL(url), net::URLFetcher::GET, this));
   const std::string auth_header("Authorization: Bearer " + access_token);
   url_fetcher->AddExtraRequestHeader(auth_header);
   url_fetcher->SetRequestContext(url_request_context_getter_.get());
   url_fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                             net::LOAD_DO_NOT_SEND_COOKIES |
@@ skipping 26 matching lines @@
       attachment.reset(new Attachment(Attachment::CreateWithId(
           download_state.attachment_id, attachment_data)));
     }
 
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(*iter, result, base::Passed(&attachment)));
   }
 }
 
 }  // namespace syncer