Change owner of DriveScheduler from DriveFileSystem to DriveSystemService.

chrome/browser/chromeos/drive/drive_scheduler.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_scheduler.h"
 
 #include <math.h>
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 36 matching lines @@
 }
 
 DriveScheduler::DriveScheduler(
     Profile* profile,
     google_apis::DriveServiceInterface* drive_service)
     : throttle_count_(0),
       disable_throttling_(false),
       drive_service_(drive_service),
       uploader_(new google_apis::DriveUploader(drive_service)),
       profile_(profile),
-      initialized_(false),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (int i = 0; i < NUM_QUEUES; ++i) {
     jobs_running_[i] = 0;
   }
+
+  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
 }
 
 DriveScheduler::~DriveScheduler() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(initialized_);
 
   size_t num_pending_jobs = 0;
   size_t num_running_jobs = 0;
   for (int i = 0; i < NUM_QUEUES; ++i) {
     num_pending_jobs += queue_[i].size();
     num_running_jobs += jobs_running_[i];
   }
   DCHECK_EQ(num_pending_jobs + num_running_jobs, job_map_.size());
 
   for (int i = 0; i < NUM_QUEUES; ++i) {
     STLDeleteElements(&queue_[i]);
   }
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
 }
 
-void DriveScheduler::Initialize() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Initialize() may be called more than once for the lifetime when the
-  // file system is remounted.
-  if (initialized_)
-    return;
-
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
-  initialized_ = true;
-}
-
 std::vector<JobInfo> DriveScheduler::GetJobInfoList() {
   std::vector<JobInfo> job_info_list;
   for (JobIDMap::iterator iter(&job_map_); !iter.IsAtEnd(); iter.Advance())
     job_info_list.push_back(*iter.GetCurrentValue());
   return job_info_list;
 }
 
 void DriveScheduler::AddObserver(JobListObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observer_list_.AddObserver(observer);
@@ skipping 808 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(JobListObserver, observer_list_, OnJobDone(job_info));
 }
 
 void DriveScheduler::NotifyJobUpdated(const JobInfo& job_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(JobListObserver, observer_list_, OnJobUpdated(job_info));
 }
 
 }  // namespace drive