ChromeOS: Use file extensions in Files app to decide which apps to use.

chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc

Index: chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
diff --git a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
index a66298d501f8985ec75913720ba886876f6b6ce3..2ebee938bcd82313f32eaa4542a5587f85418b3c 100644
--- a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
+++ b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
@@ -43,6 +43,17 @@ bool FileHandlerCanHandleFileWithExtension(
   return false;
 }
 
+bool FileHandlerCanHandleFileWithMimeType(
+    const FileHandlerInfo& handler,
+    const std::string& mime_type) {
+  for (std::set<std::string>::const_iterator type = handler.types.begin();
+       type != handler.types.end(); ++type) {
+    if (net::MatchesMimeType(*type, mime_type))
+      return true;
+  }
+  return false;
+}
+
 }  // namespace
 
 typedef std::vector<FileHandlerInfo> FileHandlerList;
@@ -77,10 +88,10 @@ const FileHandlerInfo* FirstFileHandlerForFile(
   return NULL;
 }
 
-std::vector<const FileHandlerInfo*> FindFileHandlersForMimeTypes(
-    const Extension& app, const std::set<std::string>& mime_types) {
+std::vector<const FileHandlerInfo*> FindFileHandlers(
+    const Extension& app, const MimeTypeAndPathSet& files) {
   std::vector<const FileHandlerInfo*> handlers;
-  if (mime_types.empty())
+  if (files.empty())
     return handlers;
 
   // Look for file handlers which can handle all the MIME types specified.
@@ -91,9 +102,9 @@ std::vector<const FileHandlerInfo*> FindFileHandlersForMimeTypes(
   for (FileHandlerList::const_iterator data = file_handlers->begin();
        data != file_handlers->end(); ++data) {
     bool handles_all_types = true;
-    for (std::set<std::string>::const_iterator type_iter = mime_types.begin();
-         type_iter != mime_types.end(); ++type_iter) {
-      if (!FileHandlerCanHandleFileWithMimeType(*data, *type_iter)) {
+    for (MimeTypeAndPathSet::const_iterator it = files.begin();
+         it != files.end(); ++it) {
+      if (!FileHandlerCanHandleFile(*data, it->first, it->second)) {
         handles_all_types = false;
         break;
       }
@@ -112,17 +123,6 @@ bool FileHandlerCanHandleFile(
       FileHandlerCanHandleFileWithExtension(handler, path);
 }
 
-bool FileHandlerCanHandleFileWithMimeType(
-    const FileHandlerInfo& handler,
-    const std::string& mime_type) {
-  for (std::set<std::string>::const_iterator type = handler.types.begin();
-       type != handler.types.end(); ++type) {
-    if (net::MatchesMimeType(*type, mime_type))
-      return true;
-  }
-  return false;
-}
-
 GrantedFileEntry CreateFileEntry(
     Profile* profile,
     const std::string& extension_id,