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

chrome/browser/extensions/api/file_system/file_system_api.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/api/file_system/file_system_api.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/browser/file_handler_util.h"
 #include "apps/saved_files_service.h"
@@ skipping 32 matching lines @@
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 #include "base/mac/foundation_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
 #endif
 
 using apps::SavedFileEntry;
 using apps::SavedFilesService;
 using apps::AppWindow;
 using fileapi::IsolatedContext;
 
 const char kInvalidCallingPage[] = "Invalid calling page. This function can't "
     "be called from a background page.";
 const char kUserCancelled[] = "User cancelled";
@@ skipping 609 matching lines @@
     DCHECK(registry);
     AppWindow* app_window =
         registry->GetAppWindowForRenderViewHost(render_view_host());
     if (!app_window) {
       error_ = kInvalidCallingPage;
       SendResponse(false);
       return;
     }
     content::WebContents* web_contents = app_window->web_contents();
 
+    DCHECK_EQ(paths.size(), 1u);
+#if defined(OS_CHROMEOS)
+    base::FilePath check_path =
+        file_manager::util::IsUnderNonNativeLocalPath(GetProfile(), paths[0])
+            ? paths[0]
+            : base::MakeAbsoluteFilePath(paths[0]);
+#else
+    base::FilePath check_path = base::MakeAbsoluteFilePath(paths[0]);
+#endif
+
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE,
         FROM_HERE,
         base::Bind(
             &FileSystemChooseEntryFunction::ConfirmDirectoryAccessOnFileThread,
             this,
+            check_path,
             paths,
             web_contents));
     return;
   }
 
   OnDirectoryAccessConfirmed(paths);
 }
 
 void FileSystemChooseEntryFunction::FileSelectionCanceled() {
   error_ = kUserCancelled;
   SendResponse(false);
 }
 
 void FileSystemChooseEntryFunction::ConfirmDirectoryAccessOnFileThread(
+    const base::FilePath& check_path,
     const std::vector<base::FilePath>& paths,
     content::WebContents* web_contents) {
-  DCHECK_EQ(paths.size(), 1u);
-#if defined(OS_CHROMEOS)
-  const base::FilePath path =
-      drive::util::IsUnderDriveMountPoint(paths[0]) ? paths[0] :
-          base::MakeAbsoluteFilePath(paths[0]);
-#else
-  const base::FilePath path = base::MakeAbsoluteFilePath(paths[0]);
-#endif
-  if (path.empty()) {
+  if (check_path.empty()) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(&FileSystemChooseEntryFunction::FileSelectionCanceled,
                    this));
     return;
   }
 
   for (size_t i = 0; i < arraysize(kGraylistedPaths); i++) {
     base::FilePath graylisted_path;
     if (PathService::Get(kGraylistedPaths[i], &graylisted_path) &&
-        (path == graylisted_path || path.IsParent(graylisted_path))) {
+        (check_path == graylisted_path ||
+         check_path.IsParent(graylisted_path))) {
       if (g_skip_directory_confirmation_for_test) {
         if (g_allow_directory_access_for_test) {
           break;
         } else {
           content::BrowserThread::PostTask(
               content::BrowserThread::UI,
               FROM_HERE,
               base::Bind(&FileSystemChooseEntryFunction::FileSelectionCanceled,
                          this));
         }
@@ skipping 241 matching lines @@
   if (needs_new_entry) {
     is_directory_ = file_entry->is_directory;
     CreateResponse();
     AddEntryToResponse(file_entry->path, file_entry->id);
   }
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions