Treat unknown MIME type as application/octet-stream when launching apps.

chrome/browser/extensions/platform_app_launcher.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/extensions/platform_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 38 matching lines @@
 using extensions::app_file_handler_util::FileHandlerCanHandleFileWithMimeType;
 using extensions::app_file_handler_util::FirstFileHandlerForMimeType;
 using extensions::app_file_handler_util::CreateFileEntry;
 using extensions::app_file_handler_util::GrantedFileEntry;
 using extensions::app_file_handler_util::SavedFileEntry;
 
 namespace extensions {
 
 namespace {
 
+const char kFallbackMimeType[] = "application/octet-stream";
+
 bool MakePathAbsolute(const base::FilePath& current_directory,
                       base::FilePath* file_path) {
   DCHECK(file_path);
   if (file_path->IsAbsolute())
     return true;
 
   if (current_directory.empty()) {
     *file_path = base::MakeAbsoluteFilePath(*file_path);
     return !file_path->empty();
   }
@@ skipping 78 matching lines @@
     // If the file doesn't exist, or is a directory, launch with no launch data.
     if (!file_util::PathExists(file_path_) ||
         file_util::DirectoryExists(file_path_)) {
       LOG(WARNING) << "No file exists with path " << file_path_.value();
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
               &PlatformAppPathLauncher::LaunchWithNoLaunchData, this));
       return;
     }
 
     std::string mime_type;
-    // If we cannot obtain the MIME type, launch with no launch data.
     if (!net::GetMimeTypeFromFile(file_path_, &mime_type)) {

[koz (OOO until 15th September), 2013/04/16 04:56:18]

nit: curlies are unnecessary now

[Sam McNally, 2013/04/16 05:17:33]

Done.

-      LOG(WARNING) << "Could not obtain MIME type for "
-                   << file_path_.value();
-      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
-              &PlatformAppPathLauncher::LaunchWithNoLaunchData, this));
-      return;
+      mime_type.assign(kFallbackMimeType);

[koz (OOO until 15th September), 2013/04/16 04:56:18]

Is this different to

mime_type = kFallbackMimeType

?

[Sam McNally, 2013/04/16 05:17:33]

No. Changed to assignment as it's probably clearer.

     }
 
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
             &PlatformAppPathLauncher::LaunchWithMimeType, this, mime_type));
   }
 
 #if defined(OS_CHROMEOS)
   void GetMimeTypeAndLaunchForDriveFile() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     drive::DriveSystemService* service =
         drive::DriveSystemServiceFactory::FindForProfile(profile_);
     if (!service) {
       LaunchWithNoLaunchData();
       return;
     }
 
     service->file_system()->GetFileByPath(
         drive::util::ExtractDrivePath(file_path_),
         base::Bind(&PlatformAppPathLauncher::OnGotDriveFile, this));
   }
 
   void OnGotDriveFile(drive::DriveFileError error,
                       const base::FilePath& file_path,
                       const std::string& mime_type,
                       drive::DriveFileType file_type) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-    if (error != drive::DRIVE_FILE_OK || mime_type.empty() ||
-        file_type != drive::REGULAR_FILE) {
+    if (error != drive::DRIVE_FILE_OK || file_type != drive::REGULAR_FILE) {
       LaunchWithNoLaunchData();
       return;
     }
 
-    LaunchWithMimeType(mime_type);
+    if (mime_type.empty()) {

[koz (OOO until 15th September), 2013/04/16 04:56:18]

nit: remove curlies

[Sam McNally, 2013/04/16 05:17:33]

Done.

+      LaunchWithMimeType(kFallbackMimeType);

[koz (OOO until 15th September), 2013/04/16 04:56:18]

nit: I think

LaunchWithMimeType(mime_type.empty() ? kFallbackMimeType : mime_type);

is slightly less redundant.

[Sam McNally, 2013/04/16 05:17:33]

Done.

+    } else {
+      LaunchWithMimeType(mime_type);
+    }
   }
 #endif  // defined(OS_CHROMEOS)
 
   void LaunchWithNoLaunchData() {
     // This method is required as an entry point on the UI thread.
     LaunchPlatformAppWithNoData(profile_, extension_);
   }
 
   void LaunchWithMimeType(const std::string& mime_type) {
     // Find file handler from the platform app for the file being opened.
@@ skipping 210 matching lines @@
 void RestartPlatformAppWithFileEntries(
     Profile* profile,
     const Extension* extension,
     const std::vector<SavedFileEntry>& file_entries) {
   scoped_refptr<SavedFileEntryLauncher> launcher = new SavedFileEntryLauncher(
       profile, extension, file_entries);
   launcher->Launch();
 }
 
 }  // namespace extensions