Change owner of DriveScheduler from DriveFileSystem to DriveSystemService.

chrome/browser/chromeos/drive/drive_file_system.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/drive/drive_file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop_proxy.h"
@@ skipping 193 matching lines @@
   std::string md5;
 };
 
 
 // DriveFileSystem class implementation.
 
 DriveFileSystem::DriveFileSystem(
     Profile* profile,
     DriveCache* cache,
     google_apis::DriveServiceInterface* drive_service,
+    DriveScheduler* scheduler,
     DriveWebAppsRegistry* webapps_registry,
     DriveResourceMetadata* resource_metadata,
     base::SequencedTaskRunner* blocking_task_runner)
     : profile_(profile),
       cache_(cache),
       drive_service_(drive_service),
+      scheduler_(scheduler),
       webapps_registry_(webapps_registry),
       resource_metadata_(resource_metadata),
       last_update_check_error_(DRIVE_FILE_OK),
       hide_hosted_docs_(false),
       blocking_task_runner_(blocking_task_runner),
-      scheduler_(new DriveScheduler(profile, drive_service)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   // Should be created from the file browser extension API on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void DriveFileSystem::Reload() {
   resource_metadata_->Reset(base::Bind(&DriveFileSystem::ReloadAfterReset,
                                        weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DriveFileSystem::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   SetupChangeListLoader();
 
   // Allocate the drive operation handlers.
-  drive_operations_.Init(scheduler_.get(),
+  drive_operations_.Init(scheduler_,
                          this,  // DriveFileSystemInterface
                          cache_,
                          resource_metadata_,
                          blocking_task_runner_,
                          this);  // OperationObserver
 
   PrefService* pref_service = profile_->GetPrefs();
   hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableDriveHostedFiles);
 
-  scheduler_->Initialize();
-
   InitializePreferenceObserver();
 }
 
 void DriveFileSystem::ReloadAfterReset() {
   SetupChangeListLoader();
 
   change_list_loader_->LoadIfNeeded(
       DirectoryFetchInfo(),
       base::Bind(&DriveFileSystem::OnUpdateChecked,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DriveFileSystem::SetupChangeListLoader() {
   change_list_loader_.reset(new ChangeListLoader(resource_metadata_,
-                                                 scheduler_.get(),
+                                                 scheduler_,
                                                  webapps_registry_));
   change_list_loader_->AddObserver(this);
 }
 
 void DriveFileSystem::CheckForUpdates() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DVLOG(1) << "CheckForUpdates";
 
   if (change_list_loader_) {
     change_list_loader_->CheckForUpdates(
@@ skipping 1405 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   util::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   callback.Run(DRIVE_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace drive