Reland 220012: Move the functions of filebrowserPrivateApi from the file_manager namespace to the e…

chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc

Index: chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
index 5742ce9272fa75ad63cf73d3f19216d52a0deaae..8860cce60d820afebb1f5f0b5b8051fc10663ca8 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
@@ -29,7 +29,7 @@ using extensions::app_file_handler_util::FindFileHandlersForFiles;
 using extensions::Extension;
 using fileapi::FileSystemURL;
 
-namespace file_manager {
+namespace extensions {
 namespace {
 
 // Error messages.
@@ -128,8 +128,8 @@ bool ExecuteTaskFunction::RunImpl() {
   if (!args_->GetList(1, &files_list))
     return false;
 
-  file_tasks::TaskDescriptor task;
-  if (!file_tasks::ParseTaskID(task_id, &task)) {
+  file_manager::file_tasks::TaskDescriptor task;
+  if (!file_manager::file_tasks::ParseTaskID(task_id, &task)) {
     LOG(WARNING) << "Invalid task " << task_id;
     return false;
   }
@@ -138,7 +138,7 @@ bool ExecuteTaskFunction::RunImpl() {
     return true;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      util::GetFileSystemContextForRenderViewHost(
+      file_manager::util::GetFileSystemContextForRenderViewHost(
           profile(), render_view_host());
 
   std::vector<FileSystemURL> file_urls;
@@ -156,8 +156,8 @@ bool ExecuteTaskFunction::RunImpl() {
     file_urls.push_back(url);
   }
 
-  int32 tab_id = util::GetTabId(dispatcher());
-  return file_tasks::ExecuteFileTask(
+  int32 tab_id = file_manager::util::GetTabId(dispatcher());
+  return file_manager::file_tasks::ExecuteFileTask(
       profile(),
       source_url(),
       extension_->id(),
@@ -211,10 +211,10 @@ void GetFileTasksFunction::GetAvailableDriveTasks(
       // For the first file, we store all the info.
       for (size_t j = 0; j < app_info_list.size(); ++j) {
         const drive::DriveAppInfo& app_info = *app_info_list[j];
-        GURL icon_url = util::FindPreferredIcon(app_info.app_icons,
-                                                util::kPreferredIconSize);
+        GURL icon_url = file_manager::util::FindPreferredIcon(
+            app_info.app_icons, file_manager::util::kPreferredIconSize);
         task_info_map->insert(std::pair<std::string, TaskInfo>(
-            file_tasks::MakeDriveAppTaskId(app_info.app_id),
+            file_manager::file_tasks::MakeDriveAppTaskId(app_info.app_id),
             TaskInfo(app_info.app_name, icon_url)));
       }
     } else {
@@ -222,8 +222,8 @@ void GetFileTasksFunction::GetAvailableDriveTasks(
       // based on the task id.
       std::set<std::string> task_id_set;
       for (size_t j = 0; j < app_info_list.size(); ++j) {
-        task_id_set.insert(
-            file_tasks::MakeDriveAppTaskId(app_info_list[j]->app_id));
+        task_id_set.insert(file_manager::file_tasks::MakeDriveAppTaskId(
+            app_info_list[j]->app_id));
       }
       for (TaskInfoMap::iterator iter = task_info_map->begin();
            iter != task_info_map->end(); ) {
@@ -249,7 +249,7 @@ void GetFileTasksFunction::FindDefaultDriveTasks(
        it != path_mime_set.end(); ++it) {
     const base::FilePath& file_path = it->first;
     const std::string& mime_type = it->second;
-    std::string task_id = file_tasks::GetDefaultTaskIdFromPrefs(
+    std::string task_id = file_manager::file_tasks::GetDefaultTaskIdFromPrefs(
         profile_, mime_type, file_path.Extension());
     if (task_info_map.find(task_id) != task_info_map.end())
       default_tasks->insert(task_id);
@@ -333,7 +333,7 @@ void GetFileTasksFunction::FindFileHandlerTasks(
   std::set<std::string> default_tasks;
   for (PathAndMimeTypeSet::iterator it = path_mime_set.begin();
        it != path_mime_set.end(); ++it) {
-    default_tasks.insert(file_tasks::GetDefaultTaskIdFromPrefs(
+    default_tasks.insert(file_manager::file_tasks::GetDefaultTaskIdFromPrefs(
         profile_, it->second, it->first.Extension()));
   }
 
@@ -359,8 +359,10 @@ void GetFileTasksFunction::FindFileHandlerTasks(
     for (FileHandlerList::iterator i = file_handlers.begin();
          i != file_handlers.end(); ++i) {
       DictionaryValue* task = new DictionaryValue;
-      std::string task_id = file_tasks::MakeTaskID(
-          extension->id(), file_tasks::TASK_TYPE_FILE_HANDLER, (*i)->id);
+      std::string task_id = file_manager::file_tasks::MakeTaskID(
+          extension->id(),
+          file_manager::file_tasks::TASK_TYPE_FILE_HANDLER,
+          (*i)->id);
       task->SetString("taskId", task_id);
       task->SetString("title", (*i)->title);
       if (!(*default_already_set) && ContainsKey(default_tasks, task_id)) {
@@ -372,7 +374,7 @@ void GetFileTasksFunction::FindFileHandlerTasks(
 
       GURL best_icon = extensions::ExtensionIconSource::GetIconURL(
           extension,
-          util::kPreferredIconSize,
+          file_manager::util::kPreferredIconSize,
           ExtensionIconSet::MATCH_BIGGER,
           false,  // grayscale
           NULL);  // exists
@@ -397,18 +399,19 @@ void GetFileTasksFunction::FindFileBrowserHandlerTasks(
   DCHECK(result_list);
   DCHECK(default_already_set);
 
-  file_browser_handlers::FileBrowserHandlerList common_tasks =
-      file_browser_handlers::FindCommonFileBrowserHandlers(profile_, file_urls);
+  file_manager::file_browser_handlers::FileBrowserHandlerList common_tasks =
+      file_manager::file_browser_handlers::FindCommonFileBrowserHandlers(
+          profile_, file_urls);
   if (common_tasks.empty())
     return;
-  file_browser_handlers::FileBrowserHandlerList default_tasks =
-      file_browser_handlers::FindDefaultFileBrowserHandlers(
+  file_manager::file_browser_handlers::FileBrowserHandlerList default_tasks =
+      file_manager::file_browser_handlers::FindDefaultFileBrowserHandlers(
           profile_, file_paths, common_tasks);
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
-  for (file_browser_handlers::FileBrowserHandlerList::const_iterator iter =
-           common_tasks.begin();
+  for (file_manager::file_browser_handlers::FileBrowserHandlerList::
+           const_iterator iter = common_tasks.begin();
        iter != common_tasks.end();
        ++iter) {
     const FileBrowserHandler* handler = *iter;
@@ -416,9 +419,9 @@ void GetFileTasksFunction::FindFileBrowserHandlerTasks(
     const Extension* extension = service->GetExtensionById(extension_id, false);
     CHECK(extension);
     DictionaryValue* task = new DictionaryValue;
-    task->SetString("taskId", file_tasks::MakeTaskID(
+    task->SetString("taskId", file_manager::file_tasks::MakeTaskID(
         extension_id,
-        file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
+        file_manager::file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
         handler->id()));
     task->SetString("title", handler->title());
     // TODO(zelidrag): Figure out how to expose icon URL that task defined in
@@ -466,7 +469,7 @@ bool GetFileTasksFunction::RunImpl() {
     return false;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      util::GetFileSystemContextForRenderViewHost(
+      file_manager::util::GetFileSystemContextForRenderViewHost(
           profile(), render_view_host());
 
   // Collect all the URLs, convert them to GURLs, and crack all the urls into
@@ -497,7 +500,7 @@ bool GetFileTasksFunction::RunImpl() {
 
     // If MIME type is not provided, guess it from the file path.
     if (mime_type.empty())
-      mime_type = util::GetMimeTypeForPath(file_path);
+      mime_type = file_manager::util::GetMimeTypeForPath(file_path);
 
     path_mime_set.insert(std::make_pair(file_path, mime_type));
 
@@ -552,7 +555,7 @@ bool SetDefaultTaskFunction::RunImpl() {
     return false;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      util::GetFileSystemContextForRenderViewHost(
+      file_manager::util::GetFileSystemContextForRenderViewHost(
           profile(), render_view_host());
 
   std::set<std::string> suffixes =
@@ -581,9 +584,10 @@ bool SetDefaultTaskFunction::RunImpl() {
     return true;
   }
 
-  file_tasks::UpdateDefaultTask(profile_, task_id, suffixes, mime_types);
+  file_manager::file_tasks::UpdateDefaultTask(
+      profile_, task_id, suffixes, mime_types);
 
   return true;
 }
 
-}  // namespace file_manager
+}  // namespace extensions