Fixed file/directory url resolution for external mount point provider.

chrome/browser/extensions/extension_file_browser_private_api.cc

 // Copyright (c) 2011 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/extension_file_browser_private_api.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 177 matching lines @@
         child_id_(child_id),
         extension_(extension)  {
     DCHECK(function_);
   }
 
   // fileapi::FileSystemCallbackDispatcher overrides.
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
 
+  virtual void DidGetLocalPath(const FilePath& local_path) {
+    NOTREACHED();
+  }
+
   virtual void DidReadMetadata(const base::PlatformFileInfo& info,
                                const FilePath& unused) OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidReadDirectory(
       const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more) OVERRIDE {
     NOTREACHED();
   }
@@ skipping 143 matching lines @@
     const Extension* extension = service->GetExtensionById(extension_id, false);
     CHECK(extension);
     DictionaryValue* task = new DictionaryValue();
     task->SetString("taskId", MakeTaskID(extension_id.data(),
                                          iter->second->id().data()));
     task->SetString("title", iter->second->title());
     // TODO(zelidrag): Figure out how to expose icon URL that task defined in
     // manifest instead of the default extension icon.
     GURL icon =
         ExtensionIconSource::GetIconURL(extension,
-                                        Extension::EXTENSION_ICON_SMALLISH,
+                                        Extension::EXTENSION_ICON_BITTY,
                                         ExtensionIconSet::MATCH_BIGGER,
                                         false);     // grayscale
     task->SetString("iconUrl", icon.spec());
     result_list->Append(task);
   }
 
   // TODO(zelidrag, serya): Add intent content tasks to result_list once we
   // implement that API.
   SendResponse(true);
   return true;
@@ skipping 17 matching lines @@
         task_id_(task_id),
         origin_file_urls_(file_urls) {
     DCHECK(function_);
   }
 
   // fileapi::FileSystemCallbackDispatcher overrides.
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
 
+  virtual void DidGetLocalPath(const FilePath& local_path) {
+    NOTREACHED();
+  }
+
   virtual void DidReadMetadata(const base::PlatformFileInfo& info,
                                const FilePath& unused) OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidReadDirectory(
       const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more) OVERRIDE {
     NOTREACHED();
   }
@@ skipping 61 matching lines @@
                                        virtual_path)) {
       return false;
     }
 
     // Make sure this url really being used by the right caller extension.
     if (source_url_.GetOrigin() != file_origin_url) {
       DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
       return false;
     }
 
-    FilePath root_path = path_manager->GetFileSystemRootPathOnFileThread(
-        file_origin_url,
-        fileapi::kFileSystemTypeExternal,
-        virtual_path,
-        false);     // create
+    FilePath root_path =
+        path_manager->ValidateFileSystemRootAndGetPathOnFileThread(
+          file_origin_url,
+          fileapi::kFileSystemTypeExternal,
+          virtual_path,
+          false);     // create
     FilePath final_file_path = root_path.Append(virtual_path);
 
     // Check if this file system entry exists first.
     base::PlatformFileInfo file_info;
     FilePath platform_path;
     fileapi::FileSystemOperationContext file_system_operation_context(
         profile_->GetFileSystemContext(),
         fileapi::LocalFileSystemFileUtil::GetInstance());
     if (base::PLATFORM_FILE_OK !=
             fileapi::FileSystemFileUtil::GetInstance()->GetFileInfo(
@@ skipping 249 matching lines @@
     FilePath virtual_path;
     fileapi::FileSystemType type;
     if (!CrackFileSystemURL(file_url, &file_origin_url, &type,
                             &virtual_path)) {
       continue;
     }
     if (type != fileapi::kFileSystemTypeExternal) {
       NOTREACHED();
       continue;
     }
-    FilePath root = path_manager->GetFileSystemRootPathOnFileThread(
+    FilePath root = path_manager->ValidateFileSystemRootAndGetPathOnFileThread(
         origin_url,
         fileapi::kFileSystemTypeExternal,
         FilePath(virtual_path),
         false);
     if (!root.empty()) {
       selected_files.push_back(root.Append(virtual_path));
     } else {
       LOG(WARNING) << "GetLocalPathsOnFileThread failed "
                    << file_url.spec();
     }
@@ skipping 182 matching lines @@
   SET_STRING(IDS_FILE_BROWSER, COMPUTING_SELECTION);
   SET_STRING(IDS_FILE_BROWSER, NOTHING_SELECTED);
   SET_STRING(IDS_FILE_BROWSER, ONE_FILE_SELECTED);
   SET_STRING(IDS_FILE_BROWSER, MANY_FILES_SELECTED);
 
 #undef SET_STRING
 
   SendResponse(true);
   return true;
 }