drive: Move RefreshDirectory from ResourceMetadata to ChangeListLoader

chrome/browser/chromeos/drive/change_list_loader.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/change_list_loader.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 538 matching lines @@
   DCHECK(!callback.is_null());
   DCHECK_EQ(directory_fetch_info.resource_id(),
             util::kDriveGrandRootSpecialResourceId);
 
   FileError error = GDataToFileError(status);
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
-  // Build entry map for grand root directory, since the special static
-  // directory "drive/other" is always created during the initialization of
-  // ResourceMetadata, here we only need to create a dynamic directory
-  // "drive/root" from its resource ID.
-  ResourceEntryMap grand_root_entry_map;
+  // Grand root will be changed.
+  base::FilePath* changed_directory_path =
+      new base::FilePath(util::GetDriveGrandRootPath());
+  // Add "My Drive".
   const std::string& root_resource_id = about_resource->root_folder_id();
-  grand_root_entry_map[root_resource_id] =
-      util::CreateMyDriveRootEntry(root_resource_id);
-  resource_metadata_->RefreshDirectoryOnUIThread(
-      directory_fetch_info,
-      grand_root_entry_map,
+  base::PostTaskAndReplyWithResult(
+      blocking_task_runner_,
+      FROM_HERE,
+      base::Bind(&ResourceMetadata::AddEntry,
+                 base::Unretained(resource_metadata_),
+                 util::CreateMyDriveRootEntry(root_resource_id)),
       base::Bind(&ChangeListLoader::DoLoadDirectoryFromServerAfterRefresh,
                  weak_ptr_factory_.GetWeakPtr(),
                  directory_fetch_info,
-                 callback));
+                 callback,
+                 base::Owned(changed_directory_path)));
 }
 
 void ChangeListLoader::DoLoadDirectoryFromServerAfterLoad(
     const DirectoryFetchInfo& directory_fetch_info,
     const FileOperationCallback& callback,
     ScopedVector<ChangeList> change_lists,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
   DCHECK(!directory_fetch_info.empty());
 
   if (error != FILE_ERROR_OK) {
     LOG(ERROR) << "Failed to load directory: "
                << directory_fetch_info.resource_id()
                << ": " << FileErrorToString(error);
     callback.Run(error);
     return;
   }
 
   ChangeListProcessor::ResourceEntryMap entry_map;
   ChangeListProcessor::ConvertToMap(change_lists.Pass(), &entry_map, NULL);
-  resource_metadata_->RefreshDirectoryOnUIThread(
-      directory_fetch_info,
-      entry_map,
+  base::FilePath* directory_path = new base::FilePath;
+  base::PostTaskAndReplyWithResult(
+      blocking_task_runner_,
+      FROM_HERE,
+      base::Bind(&ChangeListProcessor::RefreshDirectory,
+                 resource_metadata_,
+                 directory_fetch_info,
+                 entry_map,
+                 directory_path),
       base::Bind(&ChangeListLoader::DoLoadDirectoryFromServerAfterRefresh,
                  weak_ptr_factory_.GetWeakPtr(),
                  directory_fetch_info,
-                 callback));
+                 callback,
+                 base::Owned(directory_path)));
 }
 
 void ChangeListLoader::DoLoadDirectoryFromServerAfterRefresh(
     const DirectoryFetchInfo& directory_fetch_info,
     const FileOperationCallback& callback,
-    FileError error,
-    const base::FilePath& directory_path) {
+    const base::FilePath* directory_path,
+    FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   DVLOG(1) << "Directory loaded: " << directory_fetch_info.ToString();
   callback.Run(error);
   // Also notify the observers.
   if (error == FILE_ERROR_OK) {
     FOR_EACH_OBSERVER(ChangeListLoaderObserver, observers_,
-                      OnDirectoryChanged(directory_path));
+                      OnDirectoryChanged(*directory_path));
   }
 }
 
 void ChangeListLoader::UpdateFromChangeList(
     scoped_ptr<google_apis::AboutResource> about_resource,
     ScopedVector<ChangeList> change_lists,
     bool is_delta_update,
     const base::Closure& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
@@ skipping 44 matching lines @@
       FOR_EACH_OBSERVER(ChangeListLoaderObserver, observers_,
                         OnDirectoryChanged(*dir_iter));
     }
   }
 
   callback.Run();
 }
 
 }  // namespace internal
 }  // namespace drive