file_manager: IsFallbackFileBrowserHandler() to take TaskDescriptor

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

Index: chrome/browser/chromeos/extensions/file_manager/file_browser_handlers.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handlers.cc
index 1519e4536075f33df6040ed7f517593c706dfba5..a6052ec01788f22b66c0f373e35e8a84ec925969 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handlers.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handlers.cc
@@ -526,12 +526,12 @@ bool ExecuteFileBrowserHandler(
   return true;
 }
 
-bool IsFallbackFileBrowserHandler(const FileBrowserHandler* handler) {
-  const std::string& extension_id = handler->extension_id();
-  return (extension_id == kFileManagerAppId ||
-          extension_id == extension_misc::kQuickOfficeComponentExtensionId ||
-          extension_id == extension_misc::kQuickOfficeDevExtensionId ||
-          extension_id == extension_misc::kQuickOfficeExtensionId);
+bool IsFallbackFileBrowserHandler(const file_tasks::TaskDescriptor& task) {
+  return (task.task_type == file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER &&
+          (task.app_id == kFileManagerAppId ||
+           task.app_id == extension_misc::kQuickOfficeComponentExtensionId ||
+           task.app_id == extension_misc::kQuickOfficeDevExtensionId ||
+           task.app_id == extension_misc::kQuickOfficeExtensionId));
 }
 
 FileBrowserHandlerList FindDefaultFileBrowserHandlers(
@@ -554,10 +554,12 @@ FileBrowserHandlerList FindDefaultFileBrowserHandlers(
   // from common_handlers.
   for (size_t i = 0; i < common_handlers.size(); ++i) {
     const FileBrowserHandler* handler = common_handlers[i];
-    std::string task_id = file_tasks::MakeTaskID(
+    const file_tasks::TaskDescriptor task_descriptor(
         handler->extension_id(),
         file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
         handler->id());
+    const std::string task_id =
+        file_tasks::TaskDescriptorToId(task_descriptor);
     std::set<std::string>::iterator default_iter = default_ids.find(task_id);
     if (default_iter != default_ids.end()) {
       default_handlers.push_back(handler);
@@ -565,7 +567,7 @@ FileBrowserHandlerList FindDefaultFileBrowserHandlers(
     }
 
     // Remember the first fallback handler.
-    if (!fallback_handler && IsFallbackFileBrowserHandler(handler))
+    if (!fallback_handler && IsFallbackFileBrowserHandler(task_descriptor))
       fallback_handler = handler;
   }