gdata: Stop getting GDataUploader via GDataSystemService

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 16 matching lines @@
 
 //===================== GDataSystemService ====================================
 GDataSystemService::GDataSystemService(Profile* profile)
     : profile_(profile),
       sequence_token_(BrowserThread::GetBlockingPool()->GetSequenceToken()),
       cache_(GDataCache::CreateGDataCacheOnUIThread(
           GDataCache::GetCacheRootPath(profile_),
           BrowserThread::GetBlockingPool(),
           sequence_token_)),
       documents_service_(new DocumentsService),
+      uploader_(new GDataUploader(docs_service())),
       file_system_(new GDataFileSystem(profile,
                                        cache(),
                                        docs_service(),
+                                       uploader(),
                                        sequence_token_)),
-      uploader_(new GDataUploader(file_system(), docs_service())),
       download_observer_(new GDataDownloadObserver),
       sync_client_(new GDataSyncClient(profile, file_system(), cache())),
       webapps_registry_(new DriveWebAppsRegistry) {
   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));
 
@@ skipping 11 matching lines @@
           GDataCache::CACHE_TYPE_TMP_DOWNLOADS));
 }
 
 void GDataSystemService::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Shut down the member objects in the reverse order of creation.
   webapps_registry_.reset();
   sync_client_.reset();
   download_observer_.reset();
+  file_system_.reset();
   uploader_.reset();
-  file_system_.reset();
   documents_service_.reset();
 }
 
 //===================== GDataSystemServiceFactory =============================
 
 // static
 GDataSystemService* GDataSystemServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<GDataSystemService*>(
       GetInstance()->GetServiceForProfile(profile, true));
@@ skipping 21 matching lines @@
 }
 
 ProfileKeyedService* GDataSystemServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   GDataSystemService* service = new GDataSystemService(profile);
   service->Initialize();
   return service;
 }
 
 }  // namespace gdata