Move the check for fileBrowserHandler permission to FileBrowserHandler.

chrome/browser/chromeos/fileapi/file_system_backend.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 "chrome/browser/chromeos/fileapi/file_system_backend.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/fileapi/file_access_permissions.h"
@@ skipping 21 matching lines @@
          url.type() == storage::kFileSystemTypeRestrictedNativeLocal ||
          url.type() == storage::kFileSystemTypeDrive ||
          url.type() == storage::kFileSystemTypeProvided ||
          url.type() == storage::kFileSystemTypeDeviceMediaAsFileStorage;
 }
 
 FileSystemBackend::FileSystemBackend(
     FileSystemBackendDelegate* drive_delegate,
     FileSystemBackendDelegate* file_system_provider_delegate,
     FileSystemBackendDelegate* mtp_delegate,
-    scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy,
     scoped_refptr<storage::ExternalMountPoints> mount_points,
     storage::ExternalMountPoints* system_mount_points)
-    : special_storage_policy_(special_storage_policy),
-      file_access_permissions_(new FileAccessPermissions()),
+    : file_access_permissions_(new FileAccessPermissions()),
       local_file_util_(storage::AsyncFileUtil::CreateForLocalFileSystem()),
       drive_delegate_(drive_delegate),
       file_system_provider_delegate_(file_system_provider_delegate),
       mtp_delegate_(mtp_delegate),
       mount_points_(mount_points),
       system_mount_points_(system_mount_points) {
 }
 
 FileSystemBackend::~FileSystemBackend() {
 }
@@ skipping 121 matching lines @@
     return true;
 
   std::string extension_id = url.origin().host();
   // TODO(mtomasz): Temporarily whitelist TimeScapes. Remove this in M-31.
   // See: crbug.com/271946
   if (extension_id == "mlbmkoenclnokonejhlfakkeabdlmpek" &&
       url.type() == storage::kFileSystemTypeRestrictedNativeLocal) {
     return true;
   }
 
-  // Check first to make sure this extension has fileBrowserHander permissions.
-  if (!special_storage_policy_.get() ||
-      !special_storage_policy_->IsFileHandler(extension_id))
-    return false;
-
   return file_access_permissions_->HasAccessPermission(extension_id,
                                                        url.virtual_path());
 }
 
 void FileSystemBackend::GrantFileAccessToExtension(
     const std::string& extension_id, const base::FilePath& virtual_path) {
-  if (!special_storage_policy_.get())
-    return;
-  // All we care about here is access from extensions for now.
-  if (!special_storage_policy_->IsFileHandler(extension_id)) {
-    NOTREACHED();
-    return;
-  }
-
   std::string id;
   storage::FileSystemType type;
   std::string cracked_id;
   base::FilePath path;
   storage::FileSystemMountOption option;
   if (!mount_points_->CrackVirtualPath(virtual_path, &id, &type, &cracked_id,
                                        &path, &option) &&
       !system_mount_points_->CrackVirtualPath(virtual_path, &id, &type,
                                               &cracked_id, &path, &option)) {
     return;
@@ skipping 212 matching lines @@
     const base::FilePath& entry_path) const {
   base::FilePath virtual_path;
   if (!GetVirtualPath(entry_path, &virtual_path))
     return storage::FileSystemURL();
 
   return context->CreateCrackedFileSystemURL(
       GURL() /* origin */, storage::kFileSystemTypeExternal, virtual_path);
 }
 
 }  // namespace chromeos