Refactor "IsUnderDriveMountPoint" in v2 app code for generalization to non-Drive volumes.

apps/launcher.cc

 // Copyright 2013 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 "apps/launcher.h"
 
 #include "apps/browser/api/app_runtime/app_runtime_api.h"
 #include "apps/browser/file_handler_util.h"
 #include "apps/common/api/app_runtime.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
 #include "net/base/filename_util.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/drive/file_errors.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
-#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #endif
 
 namespace app_runtime = apps::api::app_runtime;
 
 using apps::file_handler_util::GrantedFileEntry;
 using content::BrowserThread;
 using extensions::app_file_handler_util::CheckWritableFiles;
 using extensions::app_file_handler_util::FileHandlerForId;
 using extensions::app_file_handler_util::FileHandlerCanHandleFile;
@@ skipping 101 matching lines @@
       file_path_ = base::FilePath();
     }
 
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&PlatformAppPathLauncher::Launch, this));
   }
 
   void OnFileValid() {
 #if defined(OS_CHROMEOS)
-    if (drive::util::IsUnderDriveMountPoint(file_path_)) {
-      PlatformAppPathLauncher::GetMimeTypeAndLaunchForDriveFile();
+    if (file_manager::util::IsUnderSpecialPath(profile_, file_path_)) {
+      file_manager::util::GetSpecialPathMimeType(
+          profile_,
+          file_path_,
+          base::Bind(&PlatformAppPathLauncher::OnGotMimeType, this));
       return;
     }
 #endif
 
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&PlatformAppPathLauncher::GetMimeTypeAndLaunch, this));
   }
 
@@ skipping 27 matching lines @@
                            &mime_type);
       }
       if (mime_type.empty())
         mime_type = kFallbackMimeType;
     }
 
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
             &PlatformAppPathLauncher::LaunchWithMimeType, this, mime_type));
   }
 
-#if defined(OS_CHROMEOS)
-  void GetMimeTypeAndLaunchForDriveFile() {
-    DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-    drive::FileSystemInterface* file_system =
-        drive::util::GetFileSystemByProfile(profile_);
-    if (!file_system) {
+  void OnGotMimeType(bool success, const std::string& mime_type) {

[mtomasz, 2014/05/26 05:54:15]

nit: In app_file_handler_util.cc, chromeos-only methods are wrapped by
defined(OS_CHROMEOS), but here not. I think we should choose one way.

[benwells, 2014/05/27 03:21:20]

Let's #if it out.

[kinaba, 2014/05/27 05:39:28]

Done.

+    if (!success) {
       LaunchWithNoLaunchData();
       return;
     }
-
-    file_system->GetFile(
-        drive::util::ExtractDrivePath(file_path_),
-        base::Bind(&PlatformAppPathLauncher::OnGotDriveFile, this));
-  }
-
-  void OnGotDriveFile(drive::FileError error,
-                      const base::FilePath& file_path,
-                      scoped_ptr<drive::ResourceEntry> entry) {
-    DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-    if (error != drive::FILE_ERROR_OK ||
-        !entry || entry->file_specific_info().is_hosted_document()) {
-      LaunchWithNoLaunchData();
-      return;
-    }
-
-    const std::string& mime_type =
-        entry->file_specific_info().content_mime_type();
     LaunchWithMimeType(mime_type.empty() ? kFallbackMimeType : 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.
     const extensions::FileHandlerInfo* handler = NULL;
     if (!handler_id_.empty())
@@ skipping 170 matching lines @@
 void LaunchPlatformAppWithUrl(Profile* profile,
                               const Extension* extension,
                               const std::string& handler_id,
                               const GURL& url,
                               const GURL& referrer_url) {
   AppEventRouter::DispatchOnLaunchedEventWithUrl(
       profile, extension, handler_id, url, referrer_url);
 }
 
 }  // namespace apps