Revert of Consolidate attachment URL construction.

chrome/browser/sync/profile_sync_components_factory_impl.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/history/history_service.h"
@@ skipping 106 matching lines @@
 using browser_sync::SyncBackendHost;
 using browser_sync::ThemeDataTypeController;
 using browser_sync::TypedUrlChangeProcessor;
 using browser_sync::TypedUrlDataTypeController;
 using browser_sync::TypedUrlModelAssociator;
 using browser_sync::UIDataTypeController;
 using content::BrowserThread;
 
 namespace {
 
+const char kAttachmentsPath[] = "/attachments/";
+
 syncer::ModelTypeSet GetDisabledTypesFromCommandLine(
     const CommandLine& command_line) {
   syncer::ModelTypeSet disabled_types;
   std::string disabled_types_str =
       command_line.GetSwitchValueASCII(switches::kDisableSyncTypes);
   disabled_types = syncer::ModelTypeSetFromString(disabled_types_str);
   return disabled_types;
 }
 
 syncer::ModelTypeSet GetEnabledTypesFromCommandLine(
     const CommandLine& command_line) {
   syncer::ModelTypeSet enabled_types;
   if (command_line.HasSwitch(switches::kEnableSyncSyncedNotifications)) {
     enabled_types.Put(syncer::SYNCED_NOTIFICATIONS);
   }
   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(
     Profile* profile,
     CommandLine* command_line,
     const GURL& sync_service_url,
     const std::string& account_id,
     const OAuth2TokenService::ScopeSet& scope_set,
     OAuth2TokenService* token_service,
     net::URLRequestContextGetter* url_request_context_getter)
@@ skipping 462 matching lines @@
   return task_runner_;
 }
 
 OAuth2TokenService* TokenServiceProvider::GetTokenService() {
   return token_service_;
 }
 
 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(
               content::BrowserThread::UI),
           token_service_));
 
   // TODO(maniscalco): Use shared (one per profile) thread-safe instances of
   // AttachmentUploader and AttachmentDownloader instead of creating a new one
   // per AttachmentService (bug 369536).
   scoped_ptr<syncer::AttachmentUploader> attachment_uploader(
-      new syncer::AttachmentUploaderImpl(sync_service_url_,
+      new syncer::AttachmentUploaderImpl(url_prefix,
                                          url_request_context_getter_,
                                          account_id_,
                                          scope_set_,
                                          token_service_provider.Pass()));
 
   scoped_ptr<syncer::AttachmentDownloader> attachment_downloader(
       new syncer::FakeAttachmentDownloader());
 
   scoped_ptr<syncer::AttachmentStore> attachment_store(
       new syncer::FakeAttachmentStore(
@@ skipping 43 matching lines @@
       new TypedUrlModelAssociator(profile_sync_service,
                                   history_backend,
                                   error_handler);
   TypedUrlChangeProcessor* change_processor =
       new TypedUrlChangeProcessor(profile_,
                                   model_associator,
                                   history_backend,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }