Consolidate attachment URL construction.

chrome/browser/sync/profile_sync_components_factory_impl.cc

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index b1a93fc1ce818070626774a2cde555490034b9d1..87a1c4390dda1af4f3764669a38f166a37ad17df 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -124,8 +124,6 @@ using content::BrowserThread;
 
 namespace {
 
-const char kAttachmentsPath[] = "/attachments/";
-
 syncer::ModelTypeSet GetDisabledTypesFromCommandLine(
     const CommandLine& command_line) {
   syncer::ModelTypeSet disabled_types;
@@ -144,11 +142,6 @@ syncer::ModelTypeSet GetEnabledTypesFromCommandLine(
   return enabled_types;
 }
 
-// Returns the base URL for attachments.
-std::string GetSyncServiceAttachmentsURL(const GURL& sync_service_url) {
-  return sync_service_url.spec() + kAttachmentsPath;
-}
-
 }  // namespace
 
 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
@@ -631,7 +624,6 @@ OAuth2TokenService* TokenServiceProvider::GetTokenService() {
 scoped_ptr<syncer::AttachmentService>
 ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
     syncer::AttachmentService::Delegate* delegate) {
-  std::string url_prefix = GetSyncServiceAttachmentsURL(sync_service_url_);
   scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider>
       token_service_provider(new TokenServiceProvider(
           content::BrowserThread::GetMessageLoopProxyForThread(
@@ -642,7 +634,7 @@ ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
   // AttachmentUploader and AttachmentDownloader instead of creating a new one
   // per AttachmentService (bug 369536).
   scoped_ptr<syncer::AttachmentUploader> attachment_uploader(
-      new syncer::AttachmentUploaderImpl(url_prefix,
+      new syncer::AttachmentUploaderImpl(sync_service_url_,
                                          url_request_context_getter_,
                                          account_id_,
                                          scope_set_,