drive: Minor cleanup around ChangeListLoader::LoadFromServerIfNeeded()

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 239 matching lines @@
   hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableDriveHostedFiles);
 
   scheduler_->Initialize();
 
   InitializePreferenceObserver();
 }
 
 void DriveFileSystem::ReloadAfterReset() {
   SetupChangeListLoader();
 
-  change_list_loader_->LoadFromServerIfNeeded(
+  change_list_loader_->LoadIfNeeded(

[kinaba, 2013/04/16 08:54:28]

Reload() is, at least originally, meant to be a feature
that discards the local metadata cache and reloads full
feed from the server. (That's why Load<FromServer>IfNeeded
is used here.)

But it is actually already broken already, since
LoadFromServerIfNeeded automatically respects the cache
timestamp (after we switched to level DB).

Probably we should just abandon DriveSystemService::ReloadAndRemountFileSystem.

       DirectoryFetchInfo(),
       base::Bind(&DriveFileSystem::OnUpdateChecked,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DriveFileSystem::SetupChangeListLoader() {
   change_list_loader_.reset(new ChangeListLoader(resource_metadata_,
                                                  scheduler_.get(),
                                                  webapps_registry_));
   change_list_loader_->AddObserver(this);
 }
 
 void DriveFileSystem::CheckForUpdates() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DVLOG(1) << "CheckForUpdates";
 
-  if (change_list_loader_ &&
-      change_list_loader_->loaded() &&
-      !change_list_loader_->refreshing()) {
-    change_list_loader_->LoadFromServerIfNeeded(
-        DirectoryFetchInfo(),
+  if (change_list_loader_) {
+    change_list_loader_->CheckForUpdates(
         base::Bind(&DriveFileSystem::OnUpdateChecked,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void DriveFileSystem::OnUpdateChecked(DriveFileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DVLOG(1) << "CheckForUpdates finished: " << DriveFileErrorToString(error);
   last_update_check_time_ = base::Time::Now();
   last_update_check_error_ = error;
@@ skipping 1413 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