file_manager: IsFallbackFileBrowserHandler() to take TaskDescriptor

chrome/browser/chromeos/extensions/file_manager/open_util.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/extensions/file_manager/open_util.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 226 matching lines @@
   // 5. non-default file browser handler
   // Note that there can be at most one of default extension and default app.
   const FileBrowserHandler* handler =
       file_browser_handlers::FindFileBrowserHandlerForURLAndPath(
           profile, url, file_path);
   if (!handler) {
     return OpenFileWithFileHandler(
         profile, file_path, url, mime_type, default_task_id);
   }
 
-  std::string handler_task_id = file_tasks::MakeTaskID(
-        handler->extension_id(),
-        file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
-        handler->id());
+  const file_tasks::TaskDescriptor task_descriptor(
+      handler->extension_id(),
+      file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
+      handler->id());
+  const std::string handler_task_id =
+      file_tasks::TaskDescriptorToId(task_descriptor);
   if (handler_task_id != default_task_id &&
-      !file_browser_handlers::IsFallbackFileBrowserHandler(handler) &&
+      !file_browser_handlers::IsFallbackFileBrowserHandler(task_descriptor) &&
       OpenFileWithFileHandler(
           profile, file_path, url, mime_type, default_task_id)) {
     return true;
   }
   return OpenFileWithFileBrowserHandler(profile, file_path, *handler, url);
 }
 
 // Used to implement OpenItem().
 void ContinueOpenItem(Profile* profile,
                       const base::FilePath& file_path,
@@ skipping 63 matching lines @@
                          base::Bind(&ContinueOpenItem, profile, file_path));
 }
 
 void ShowItemInFolder(const base::FilePath& file_path) {
   // This action changes the selection so we do not reuse existing tabs.
   OpenFileManagerWithInternalActionId(file_path, "select");
 }
 
 }  // namespace util
 }  // namespace file_manager