gdata: Move GDataFileSystem::AddUploadedFile() call out of uploader and into GDataDownloadObserver.

chrome/browser/chromeos/gdata/gdata_system_service.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 "chrome/browser/chromeos/gdata/gdata_system_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
@@ skipping 28 matching lines @@
           sequence_token_)),
       documents_service_(new DocumentsService),
       uploader_(new GDataUploader(docs_service())),
       webapps_registry_(new DriveWebAppsRegistry),
       file_system_(new GDataFileSystem(profile,
                                        cache(),
                                        docs_service(),
                                        uploader(),
                                        webapps_registry(),
                                        sequence_token_)),
-      download_observer_(new GDataDownloadObserver),
+      download_observer_(new GDataDownloadObserver(uploader(), file_system())),
       sync_client_(new GDataSyncClient(profile, file_system(), cache())) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // TODO(satorux): The dependency to GDataFileSystem should be
   // eliminated. http://crbug.com/133860
   uploader_->set_file_system(file_system());
 }
 
 GDataSystemService::~GDataSystemService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   cache_->DestroyOnUIThread();
 }
 
 void GDataSystemService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   sync_client_->Initialize();
   file_system_->Initialize();
   cache_->RequestInitializeOnUIThread();
 
   content::DownloadManager* download_manager =
     g_browser_process->download_status_updater() ?
         BrowserContext::GetDownloadManager(profile_) : NULL;
   download_observer_->Initialize(
-      uploader_.get(),
       download_manager,
       cache_->GetCacheDirectoryPath(
           GDataCache::CACHE_TYPE_TMP_DOWNLOADS));
 
   AddDriveMountPoint();
 }
 
 void GDataSystemService::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RemoveDriveMountPoint();
@@ skipping 60 matching lines @@
 }
 
 ProfileKeyedService* GDataSystemServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   GDataSystemService* service = new GDataSystemService(profile);
   service->Initialize();
   return service;
 }
 
 }  // namespace gdata