New FileSystemURL cracking

chrome/browser/chromeos/extensions/file_manager_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_util.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 50 matching lines @@
 #include "webkit/plugins/webplugininfo.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using content::BrowserContext;
 using content::BrowserThread;
 using content::PluginService;
 using content::UserMetricsAction;
 using extensions::Extension;
 using file_handler_util::FileTaskExecutor;
+using fileapi::FileSystemURL;
 
 #define FILEBROWSER_EXTENSON_ID "hhaomjibdihmijegdhdafkllkbggdgoj"
 const char kFileBrowserDomain[] = FILEBROWSER_EXTENSON_ID;
 
 const char kFileBrowserGalleryTaskId[] = "gallery";
 const char kFileBrowserMountArchiveTaskId[] = "mount-archive";
 const char kFileBrowserWatchTaskId[] = "watch";
 const char kFileBrowserPlayTaskId[] = "play";
 
 const char kVideoPlayerAppName[] = "videoplayer";
@@ skipping 261 matching lines @@
                     const GURL& url) {
   // We are executing the task on behalf of File Browser extension.
   const GURL source_url(kBaseFileBrowserUrl);
 
   // If File Browser has not been open yet then it did not request access
   // to the file system. Do it now.
   // File browser always runs in the site for its extension id, so that is the
   // site for which file access permissions should be granted.
   GURL site = extensions::ExtensionSystem::Get(profile)->extension_service()->
       GetSiteForExtensionId(kFileBrowserDomain);
-  fileapi::ExternalFileSystemMountPointProvider* external_provider =
+  fileapi::FileSystemContext* file_system_context =
       BrowserContext::GetStoragePartitionForSite(profile, site)->
-          GetFileSystemContext()->external_provider();
-  if (!external_provider)
+          GetFileSystemContext();
+
+  if (!file_system_context->external_provider())
     return;
-  external_provider->GrantFullAccessToExtension(source_url.host());
+  file_system_context->external_provider()->GrantFullAccessToExtension(
+      source_url.host());
 
-  std::vector<GURL> urls;
-  urls.push_back(url);
+  std::vector<FileSystemURL> urls;
+  urls.push_back(file_system_context->CrackURL(url));
   scoped_refptr<FileTaskExecutor> executor = FileTaskExecutor::Create(profile,
       source_url, kFileBrowserDomain, 0 /* no tab id */, extension_id,
       file_handler_util::kTaskFile, action_id);
   executor->Execute(urls);
 }
 
 void OpenFileBrowser(const FilePath& path,
                      TAB_REUSE_MODE mode,
                      const std::string& action_id) {
   content::RecordAction(UserMetricsAction("ShowFileBrowserFullTab"));
@@ skipping 61 matching lines @@
   }
   return NULL;
 }
 
 bool ExecuteDefaultHandler(Profile* profile, const FilePath& path) {
   GURL url;
   if (!ConvertFileToFileSystemUrl(profile, path, kFileBrowserDomain, &url))
     return false;
 
   const FileBrowserHandler* handler;
-  if (!file_handler_util::GetTaskForURL(profile, url, &handler))
+  if (!file_handler_util::GetTaskForURLAndPath(profile, url, path, &handler))
     return false;
 
   std::string extension_id = handler->extension_id();
   std::string action_id = handler->id();
   Browser* browser = chrome::FindLastActiveWithProfile(profile,
       chrome::HOST_DESKTOP_TYPE_ASH);
 
   // If there is no browsers for the profile, bail out. Return true so warning
   // about file type not being supported is not displayed.
   if (!browser)
@@ skipping 87 matching lines @@
   }
 }
 
 // Used to implement CheckIfDirectoryExists().
 void CheckIfDirectoryExistsOnIOThread(
     scoped_refptr<fileapi::FileSystemContext> file_system_context,
     const GURL& url,
     const fileapi::FileSystemOperation::StatusCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  fileapi::FileSystemURL file_system_url(url);
+  fileapi::FileSystemURL file_system_url = file_system_context->CrackURL(url);
   base::PlatformFileError error = base::PLATFORM_FILE_OK;
   fileapi::FileSystemOperation* operation =
       file_system_context->CreateFileSystemOperation(file_system_url, &error);
   if (error != base::PLATFORM_FILE_OK) {
     callback.Run(error);
     return;
   }
   operation->DirectoryExists(file_system_url, callback);
 }
 
@@ skipping 369 matching lines @@
   for (google_apis::OperationProgressStatusList::const_iterator iter =
            list.begin();
        iter != list.end(); ++iter) {
     result_list->Append(
         ProgessStatusToDictionaryValue(profile, extension_id, *iter));
   }
   return result_list.release();
 }
 
 }  // namespace file_manager_util