Move the check for fileBrowserHandler permission to FileBrowserHandler.

The previous check location was forcing all apps and extensions which call
the chrome.fileSystem.requestFileSystem API, to have "fileBrowserHandler"
permission as well.

That however doesn't make much sense, as those apps are not always handlers.
This CL moves the check to FileBrowserHandler::GetHandler() so simply the
permission has to be used only if the app wants to be a handler.

TEST=unit_test: FileBrowserHandlerManifestTest.GetHandlersRequiresPermission
BUG=470494

Review URL: https://codereview.chromium.org/1030133002

Cr-Commit-Position: refs/heads/master@{#322343}

chrome/browser/chrome_content_browser_client.cc

@@ -2346,7 +2346,6 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
       new drive::FileSystemBackendDelegate,
       new chromeos::file_system_provider::BackendDelegate,
       new chromeos::MTPFileSystemBackendDelegate(storage_partition_path),
-      browser_context->GetSpecialStoragePolicy(),
       external_mount_points,
       storage::ExternalMountPoints::GetSystemInstance());
   backend->AddSystemMountPoints();

chrome/browser/chromeos/file_manager/file_tasks_unittest.cc

@@ -572,36 +572,41 @@ TEST_F(FileManagerFileTasksComplexTest, FindFileBrowserHandlerTasks) {
   // Foo.app can handle ".txt" and ".html".
   // This one is an extension, and has "file_browser_handlers"
   extensions::ExtensionBuilder foo_app;
-  foo_app.SetManifest(extensions::DictionaryBuilder()
-                      .Set("name", "Foo")
-                      .Set("version", "1.0.0")
-                      .Set("manifest_version", 2)
-                      .Set("file_browser_handlers",
-                           extensions::ListBuilder()
-                           .Append(extensions::DictionaryBuilder()
-                                   .Set("id", "open")
-                                   .Set("default_title", "open")
-                                   .Set("file_filters",
-                                        extensions::ListBuilder()
-                                        .Append("filesystem:*.txt")
-                                        .Append("filesystem:*.html")))));
+  foo_app.SetManifest(
+      extensions::DictionaryBuilder()
+          .Set("name", "Foo")
+          .Set("version", "1.0.0")
+          .Set("manifest_version", 2)
+          .Set("permissions",
+               extensions::ListBuilder().Append("fileBrowserHandler"))
+          .Set(
+              "file_browser_handlers",
+              extensions::ListBuilder().Append(
+                  extensions::DictionaryBuilder()
+                      .Set("id", "open")
+                      .Set("default_title", "open")
+                      .Set("file_filters", extensions::ListBuilder()
+                                               .Append("filesystem:*.txt")
+                                               .Append("filesystem:*.html")))));
   foo_app.SetID(kFooId);
   extension_service_->AddExtension(foo_app.Build().get());
 
   // Bar.app can only handle ".txt".
   extensions::ExtensionBuilder bar_app;
-  bar_app.SetManifest(extensions::DictionaryBuilder()
-                      .Set("name", "Bar")
-                      .Set("version", "1.0.0")
-                      .Set("manifest_version", 2)
-                      .Set("file_browser_handlers",
-                           extensions::ListBuilder()
-                           .Append(extensions::DictionaryBuilder()
-                                   .Set("id", "open")
-                                   .Set("default_title", "open")
-                                   .Set("file_filters",
-                                        extensions::ListBuilder()
-                                        .Append("filesystem:*.txt")))));
+  bar_app.SetManifest(
+      extensions::DictionaryBuilder()
+          .Set("name", "Bar")
+          .Set("version", "1.0.0")
+          .Set("manifest_version", 2)
+          .Set("permissions",
+               extensions::ListBuilder().Append("fileBrowserHandler"))
+          .Set("file_browser_handlers",
+               extensions::ListBuilder().Append(
+                   extensions::DictionaryBuilder()
+                       .Set("id", "open")
+                       .Set("default_title", "open")
+                       .Set("file_filters", extensions::ListBuilder().Append(
+                                                "filesystem:*.txt")))));
   bar_app.SetID(kBarId);
   extension_service_->AddExtension(bar_app.Build().get());
 
@@ -614,14 +619,15 @@ TEST_F(FileManagerFileTasksComplexTest, FindFileBrowserHandlerTasks) {
           .Set("name", "Ephemeral")
           .Set("version", "1.0.0")
           .Set("manifest_version", 2)
+          .Set("permissions",
+               extensions::ListBuilder().Append("fileBrowserHandler"))
           .Set("file_browser_handlers",
                extensions::ListBuilder().Append(
                    extensions::DictionaryBuilder()
                        .Set("id", "open")
                        .Set("default_title", "open")
-                       .Set("file_filters",
-                            extensions::ListBuilder().Append(
-                                "filesystem:*.txt")))));
+                       .Set("file_filters", extensions::ListBuilder().Append(
+                                                "filesystem:*.txt")))));
   ephemeral_app.SetID(kEphemeralId);
   scoped_refptr<extensions::Extension> built_ephemeral_app(
       ephemeral_app.Build());
@@ -704,18 +710,20 @@ TEST_F(FileManagerFileTasksComplexTest, FindAllTypesOfTasks) {
   // Bar.app can only handle ".txt".
   // This is an extension (file browser handler).
   extensions::ExtensionBuilder bar_app;
-  bar_app.SetManifest(extensions::DictionaryBuilder()
-                      .Set("name", "Bar")
-                      .Set("version", "1.0.0")
-                      .Set("manifest_version", 2)
-                      .Set("file_browser_handlers",
-                           extensions::ListBuilder()
-                           .Append(extensions::DictionaryBuilder()
-                                   .Set("id", "open")
-                                   .Set("default_title", "open")
-                                   .Set("file_filters",
-                                        extensions::ListBuilder()
-                                        .Append("filesystem:*.txt")))));
+  bar_app.SetManifest(
+      extensions::DictionaryBuilder()
+          .Set("name", "Bar")
+          .Set("version", "1.0.0")
+          .Set("manifest_version", 2)
+          .Set("permissions",
+               extensions::ListBuilder().Append("fileBrowserHandler"))
+          .Set("file_browser_handlers",
+               extensions::ListBuilder().Append(
+                   extensions::DictionaryBuilder()
+                       .Set("id", "open")
+                       .Set("default_title", "open")
+                       .Set("file_filters", extensions::ListBuilder().Append(
+                                                "filesystem:*.txt")))));
   bar_app.SetID(kBarId);
   extension_service_->AddExtension(bar_app.Build().get());
 
@@ -793,18 +801,20 @@ TEST_F(FileManagerFileTasksComplexTest, FindAllTypesOfTasks_GoogleDocument) {
   // Bar.app can handle ".gdoc" files.
   // This is an extension (file browser handler).
   extensions::ExtensionBuilder bar_app;
-  bar_app.SetManifest(extensions::DictionaryBuilder()
-                      .Set("name", "Bar")
-                      .Set("version", "1.0.0")
-                      .Set("manifest_version", 2)
-                      .Set("file_browser_handlers",
-                           extensions::ListBuilder()
-                           .Append(extensions::DictionaryBuilder()
-                                   .Set("id", "open")
-                                   .Set("default_title", "open")
-                                   .Set("file_filters",
-                                        extensions::ListBuilder()
-                                        .Append("filesystem:*.gdoc")))));
+  bar_app.SetManifest(
+      extensions::DictionaryBuilder()
+          .Set("name", "Bar")
+          .Set("version", "1.0.0")
+          .Set("manifest_version", 2)
+          .Set("permissions",
+               extensions::ListBuilder().Append("fileBrowserHandler"))
+          .Set("file_browser_handlers",
+               extensions::ListBuilder().Append(
+                   extensions::DictionaryBuilder()
+                       .Set("id", "open")
+                       .Set("default_title", "open")
+                       .Set("file_filters", extensions::ListBuilder().Append(
+                                                "filesystem:*.gdoc")))));
   bar_app.SetID(kBarId);
   extension_service_->AddExtension(bar_app.Build().get());
 
@@ -812,18 +822,20 @@ TEST_F(FileManagerFileTasksComplexTest, FindAllTypesOfTasks_GoogleDocument) {
   // The ID "kFileManagerAppId" used here is precisely the one that identifies
   // the Chrome OS Files.app application.
   extensions::ExtensionBuilder files_app;
-  files_app.SetManifest(extensions::DictionaryBuilder()
-                       .Set("name", "Files")
-                       .Set("version", "1.0.0")
-                       .Set("manifest_version", 2)
-                       .Set("file_browser_handlers",
-                            extensions::ListBuilder()
-                            .Append(extensions::DictionaryBuilder()
-                                    .Set("id", "open")
-                                    .Set("default_title", "open")
-                                    .Set("file_filters",
-                                         extensions::ListBuilder()
-                                         .Append("filesystem:*.gdoc")))));
+  files_app.SetManifest(
+      extensions::DictionaryBuilder()
+          .Set("name", "Files")
+          .Set("version", "1.0.0")
+          .Set("manifest_version", 2)
+          .Set("permissions",
+               extensions::ListBuilder().Append("fileBrowserHandler"))
+          .Set("file_browser_handlers",
+               extensions::ListBuilder().Append(
+                   extensions::DictionaryBuilder()
+                       .Set("id", "open")
+                       .Set("default_title", "open")
+                       .Set("file_filters", extensions::ListBuilder().Append(
+                                                "filesystem:*.gdoc")))));
   files_app.SetID(kFileManagerAppId);
   extension_service_->AddExtension(files_app.Build().get());
 

chrome/browser/chromeos/fileapi/file_system_backend.cc

@@ -39,11 +39,9 @@ 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),
@@ -185,25 +183,12 @@ bool FileSystemBackend::IsAccessAllowed(
     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;

chrome/browser/chromeos/fileapi/file_system_backend.h

@@ -14,7 +14,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "storage/browser/fileapi/file_system_backend.h"
 #include "storage/browser/fileapi/task_runner_bound_observer_list.h"
-#include "storage/browser/quota/special_storage_policy.h"
 #include "storage/common/fileapi/file_system_types.h"
 
 namespace storage {
@@ -74,7 +73,6 @@ class FileSystemBackend : public storage::ExternalFileSystemBackend {
       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);
   ~FileSystemBackend() override;
@@ -142,7 +140,6 @@ class FileSystemBackend : public storage::ExternalFileSystemBackend {
       const base::FilePath& entry_path) const override;
 
  private:
-  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_ptr<FileAccessPermissions> file_access_permissions_;
   scoped_ptr<storage::AsyncFileUtil> local_file_util_;
 

chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc

@@ -8,7 +8,6 @@
 
 #include "base/files/file_path.h"
 #include "chromeos/dbus/cros_disks_client.h"
-#include "content/public/test/mock_special_storage_policy.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -35,15 +34,12 @@ TEST(ChromeOSFileSystemBackendTest, DefaultMountPoints) {
   // to avoid flakiness.
   storage::ExternalMountPoints::GetSystemInstance()->RevokeAllFileSystems();
 
-  scoped_refptr<storage::SpecialStoragePolicy> storage_policy =
-      new content::MockSpecialStoragePolicy();
   scoped_refptr<storage::ExternalMountPoints> mount_points(
       storage::ExternalMountPoints::CreateRefCounted());
   chromeos::FileSystemBackend backend(
       NULL,  // drive_delegate
       NULL,  // file_system_provider_delegate
       NULL,  // mtp_delegate
-      storage_policy,
       mount_points.get(),
       storage::ExternalMountPoints::GetSystemInstance());
   backend.AddSystemMountPoints();
@@ -61,8 +57,6 @@ TEST(ChromeOSFileSystemBackendTest, DefaultMountPoints) {
 }
 
 TEST(ChromeOSFileSystemBackendTest, GetRootDirectories) {
-  scoped_refptr<storage::SpecialStoragePolicy> storage_policy =
-      new content::MockSpecialStoragePolicy();
   scoped_refptr<storage::ExternalMountPoints> mount_points(
       storage::ExternalMountPoints::CreateRefCounted());
 
@@ -72,7 +66,6 @@ TEST(ChromeOSFileSystemBackendTest, GetRootDirectories) {
   chromeos::FileSystemBackend backend(NULL,  // drive_delegate
                                       NULL,  // file_system_provider_delegate
                                       NULL,  // mtp_delegate
-                                      storage_policy,
                                       mount_points.get(),
                                       system_mount_points.get());
 
@@ -110,8 +103,6 @@ TEST(ChromeOSFileSystemBackendTest, GetRootDirectories) {
 TEST(ChromeOSFileSystemBackendTest, AccessPermissions) {
   url::AddStandardScheme("chrome-extension");
 
-  scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
-      new content::MockSpecialStoragePolicy();
   scoped_refptr<storage::ExternalMountPoints> mount_points(
       storage::ExternalMountPoints::CreateRefCounted());
   scoped_refptr<storage::ExternalMountPoints> system_mount_points(
@@ -119,14 +110,11 @@ TEST(ChromeOSFileSystemBackendTest, AccessPermissions) {
   chromeos::FileSystemBackend backend(NULL,  // drive_delegate
                                       NULL,  // file_system_provider_delegate
                                       NULL,  // mtp_delegate
-                                      storage_policy,
                                       mount_points.get(),
                                       system_mount_points.get());
 
   std::string extension("ddammdhioacbehjngdmkjcjbnfginlla");
 
-  storage_policy->AddFileHandler(extension);
-
   // Initialize mount points.
   ASSERT_TRUE(system_mount_points->RegisterFileSystem(
       "system",
@@ -183,8 +171,6 @@ TEST(ChromeOSFileSystemBackendTest, AccessPermissions) {
 }
 
 TEST(ChromeOSFileSystemBackendTest, GetVirtualPathConflictWithSystemPoints) {
-  scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
-      new content::MockSpecialStoragePolicy();
   scoped_refptr<storage::ExternalMountPoints> mount_points(
       storage::ExternalMountPoints::CreateRefCounted());
   scoped_refptr<storage::ExternalMountPoints> system_mount_points(
@@ -192,7 +178,6 @@ TEST(ChromeOSFileSystemBackendTest, GetVirtualPathConflictWithSystemPoints) {
   chromeos::FileSystemBackend backend(NULL,  // drive_delegate
                                       NULL,  // file_system_provider_delegate
                                       NULL,  // mtp_delegate
-                                      storage_policy,
                                       mount_points.get(),
                                       system_mount_points.get());
 

chrome/browser/extensions/extension_special_storage_policy.cc

@@ -129,12 +129,6 @@ bool ExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() {
   return false;
 }
 
-bool ExtensionSpecialStoragePolicy::IsFileHandler(
-    const std::string& extension_id) {
-  base::AutoLock locker(lock_);
-  return file_handler_extensions_.ContainsExtension(extension_id);
-}
-
 bool ExtensionSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
   base::AutoLock locker(lock_);
   return isolated_extensions_.Contains(origin);

chrome/browser/extensions/extension_special_storage_policy.h

@@ -36,7 +36,6 @@ class ExtensionSpecialStoragePolicy : public storage::SpecialStoragePolicy {
   bool IsStorageUnlimited(const GURL& origin) override;
   bool IsStorageSessionOnly(const GURL& origin) override;
   bool CanQueryDiskSize(const GURL& origin) override;
-  bool IsFileHandler(const std::string& extension_id) override;
   bool HasIsolatedStorage(const GURL& origin) override;
   bool HasSessionOnlyOrigins() override;
 

chrome/browser/extensions/mock_extension_special_storage_policy.cc

@@ -24,11 +24,6 @@ bool MockExtensionSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) {
   return false;
 }
 
-bool MockExtensionSpecialStoragePolicy::IsFileHandler(
-    const std::string& extension_id) {
-  return false;
-}
-
 bool MockExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() {
   return false;
 }

chrome/browser/extensions/mock_extension_special_storage_policy.h

@@ -23,7 +23,6 @@ class MockExtensionSpecialStoragePolicy : public ExtensionSpecialStoragePolicy {
   bool IsStorageUnlimited(const GURL& origin) override;
   bool IsStorageSessionOnly(const GURL& origin) override;
   bool CanQueryDiskSize(const GURL& origin) override;
-  bool IsFileHandler(const std::string& extension_id) override;
   bool HasSessionOnlyOrigins() override;
 
   void AddProtected(const GURL& origin) {

chrome/browser/platform_util_unittest.cc

@@ -50,19 +50,12 @@ class PlatformUtilTestContentBrowserClient
       ScopedVector<storage::FileSystemBackend>* additional_backends) override {
     storage::ExternalMountPoints* external_mount_points =
         content::BrowserContext::GetMountPoints(browser_context);
-    scoped_refptr<content::MockSpecialStoragePolicy> special_storage_policy =
-        new content::MockSpecialStoragePolicy();
 
     // New FileSystemBackend that uses our MockSpecialStoragePolicy.
     chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
-        nullptr, nullptr, nullptr, special_storage_policy,
-        external_mount_points,
+        nullptr, nullptr, nullptr, external_mount_points,
         storage::ExternalMountPoints::GetSystemInstance());
     additional_backends->push_back(backend);
-
-    // The only change we need to make is to add kFileManagerAppId as a file
-    // handler.
-    special_storage_policy->AddFileHandler(file_manager::kFileManagerAppId);
   }
 };
 

chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc

@@ -13,6 +13,8 @@
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_handlers/permissions_parser.h"
+#include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/url_pattern.h"
 #include "url/url_constants.h"
 
@@ -115,11 +117,12 @@ bool FileBrowserHandler::HasCreateAccessPermission() const {
 // static
 FileBrowserHandler::List*
 FileBrowserHandler::GetHandlers(const extensions::Extension* extension) {
-  FileBrowserHandlerInfo* info = static_cast<FileBrowserHandlerInfo*>(
+  FileBrowserHandlerInfo* const info = static_cast<FileBrowserHandlerInfo*>(
       extension->GetManifestData(keys::kFileBrowserHandlers));
-  if (info)
-    return &info->file_browser_handlers;
-  return NULL;
+  if (!info)
+    return nullptr;
+
+  return &info->file_browser_handlers;
 }
 
 FileBrowserHandlerParser::FileBrowserHandlerParser() {
@@ -268,12 +271,19 @@ bool LoadFileBrowserHandlers(
 
 bool FileBrowserHandlerParser::Parse(extensions::Extension* extension,
                                      base::string16* error) {
+  // If the permission is missing, then skip parsing the list of handlers.
+  if (!extensions::PermissionsParser::HasAPIPermission(
+          extension, extensions::APIPermission::ID::kFileBrowserHandler)) {
+    return true;
+  }
+
   const base::ListValue* file_browser_handlers_value = NULL;
   if (!extension->manifest()->GetList(keys::kFileBrowserHandlers,
                                       &file_browser_handlers_value)) {
     *error = base::ASCIIToUTF16(errors::kInvalidFileBrowserHandler);
     return false;
   }
+
   scoped_ptr<FileBrowserHandlerInfo> info(new FileBrowserHandlerInfo);
   if (!LoadFileBrowserHandlers(extension->id(),
                                file_browser_handlers_value,

chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc

@@ -24,6 +24,53 @@ namespace {
 class FileBrowserHandlerManifestTest : public ChromeManifestTest {
 };
 
+#if !defined(OS_CHROMEOS)
+TEST_F(FileBrowserHandlerManifestTest, PermissionNotAllowedOnNonChromeOS) {
+  RunTestcase(
+      Testcase("filebrowser_valid.json",
+               "'fileBrowserHandler' is not allowed for specified platform."),
+      EXPECT_TYPE_WARNING);
+}
+#else
+
+TEST_F(FileBrowserHandlerManifestTest, PermissionAllowed) {
+  RunTestcase(Testcase("filebrowser_valid.json"), EXPECT_TYPE_SUCCESS);
+}
+
+TEST_F(FileBrowserHandlerManifestTest, GetHandlersRequiresPermission) {
+  extensions::DictionaryBuilder bad_manifest_builder;
+  bad_manifest_builder.Set("name", "Foo")
+      .Set("version", "1.0.0")
+      .Set("manifest_version", 2)
+      .Set("file_browser_handlers",
+           extensions::ListBuilder().Append(
+               extensions::DictionaryBuilder()
+                   .Set("id", "open")
+                   .Set("default_title", "open")
+                   .Set("file_filters", extensions::ListBuilder()
+                                            .Append("filesystem:*.txt")
+                                            .Append("filesystem:*.html"))));
+  scoped_ptr<base::DictionaryValue> bad_manifest_value(
+      bad_manifest_builder.Build());
+
+  // Create a good manifest by extending the bad one with the missing
+  // permission.
+  extensions::DictionaryBuilder good_manifest_builder(
+      *make_scoped_ptr(bad_manifest_value->DeepCopy()).get());
+  good_manifest_builder.Set(
+      "permissions", extensions::ListBuilder().Append("fileBrowserHandler"));
+
+  extensions::ExtensionBuilder bad_app_builder;
+  bad_app_builder.SetManifest(bad_manifest_value.Pass());
+  scoped_refptr<extensions::Extension> bad_app(bad_app_builder.Build());
+  EXPECT_FALSE(FileBrowserHandler::GetHandlers(bad_app.get()));
+
+  extensions::ExtensionBuilder good_app_builder;
+  good_app_builder.SetManifest(good_manifest_builder);
+  scoped_refptr<extensions::Extension> good_app(good_app_builder.Build());
+  EXPECT_TRUE(FileBrowserHandler::GetHandlers(good_app.get()));
+}
+
 TEST_F(FileBrowserHandlerManifestTest, InvalidFileBrowserHandlers) {
   Testcase testcases[] = {
     Testcase("filebrowser_invalid_access_permission.json",
@@ -56,18 +103,22 @@ TEST_F(FileBrowserHandlerManifestTest, InvalidFileBrowserHandlers) {
 TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandler) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
-      .SetManifest(DictionaryBuilder()
+          .SetManifest(
+               DictionaryBuilder()
                    .Set("name", "file browser handler test")
                    .Set("version", "1.0.0")
                    .Set("manifest_version", 2)
-                   .Set("file_browser_handlers", ListBuilder()
-                       .Append(DictionaryBuilder()
-                           .Set("id", "ExtremelyCoolAction")
-                           .Set("default_title", "Be Amazed")
-                           .Set("default_icon", "icon.png")
-                           .Set("file_filters", ListBuilder()
-                               .Append("filesystem:*.txt")))))
-      .Build();
+                   .Set("permissions",
+                        extensions::ListBuilder().Append("fileBrowserHandler"))
+                   .Set("file_browser_handlers",
+                        ListBuilder().Append(
+                            DictionaryBuilder()
+                                .Set("id", "ExtremelyCoolAction")
+                                .Set("default_title", "Be Amazed")
+                                .Set("default_icon", "icon.png")
+                                .Set("file_filters", ListBuilder().Append(
+                                                         "filesystem:*.txt")))))
+          .Build();
 
   ASSERT_TRUE(extension.get());
   FileBrowserHandler::List* handlers =
@@ -91,19 +142,23 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandler) {
 TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerMIMETypes) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
-      .SetID(extension_misc::kQuickOfficeExtensionId)
-      .SetManifest(DictionaryBuilder()
+          .SetID(extension_misc::kQuickOfficeExtensionId)
+          .SetManifest(
+               DictionaryBuilder()
                    .Set("name", "file browser handler test")
                    .Set("version", "1.0.0")
                    .Set("manifest_version", 2)
-                   .Set("file_browser_handlers", ListBuilder()
-                       .Append(DictionaryBuilder()
-                           .Set("id", "ID")
-                           .Set("default_title", "Default title")
-                           .Set("default_icon", "icon.png")
-                           .Set("file_filters", ListBuilder()
-                               .Append("filesystem:*.txt")))))
-      .Build();
+                   .Set("permissions",
+                        extensions::ListBuilder().Append("fileBrowserHandler"))
+                   .Set("file_browser_handlers",
+                        ListBuilder().Append(
+                            DictionaryBuilder()
+                                .Set("id", "ID")
+                                .Set("default_title", "Default title")
+                                .Set("default_icon", "icon.png")
+                                .Set("file_filters", ListBuilder().Append(
+                                                         "filesystem:*.txt")))))
+          .Build();
 
   ASSERT_TRUE(extension.get());
   FileBrowserHandler::List* handlers =
@@ -121,20 +176,24 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerMIMETypes) {
 TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerWithCreate) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
-      .SetManifest(DictionaryBuilder()
+          .SetManifest(
+               DictionaryBuilder()
                    .Set("name", "file browser handler test create")
                    .Set("version", "1.0.0")
                    .Set("manifest_version", 2)
-                   .Set("file_browser_handlers", ListBuilder()
-                       .Append(DictionaryBuilder()
-                           .Set("id", "ID")
-                           .Set("default_title", "Default title")
-                           .Set("default_icon", "icon.png")
-                           .Set("file_filters", ListBuilder()
-                               .Append("filesystem:*.txt"))
-                           .Set("file_access", ListBuilder()
-                               .Append("create")))))
-      .Build();
+                   .Set("permissions",
+                        extensions::ListBuilder().Append("fileBrowserHandler"))
+                   .Set("file_browser_handlers",
+                        ListBuilder().Append(
+                            DictionaryBuilder()
+                                .Set("id", "ID")
+                                .Set("default_title", "Default title")
+                                .Set("default_icon", "icon.png")
+                                .Set("file_filters",
+                                     ListBuilder().Append("filesystem:*.txt"))
+                                .Set("file_access",
+                                     ListBuilder().Append("create")))))
+          .Build();
 
   ASSERT_TRUE(extension.get());
   FileBrowserHandler::List* handlers =
@@ -149,5 +208,6 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerWithCreate) {
   EXPECT_FALSE(action->CanRead());
   EXPECT_FALSE(action->CanWrite());
 }
+#endif
 
 }  // namespace

chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/manifest.json

@@ -17,7 +17,6 @@
   },
   "permissions": [
     "fileManagerPrivate",
-    "fileBrowserHandler",
     {
       "fileSystem": ["requestFileSystem", "write"]
     },

chrome/test/data/extensions/api_test/file_browser/content_checksum_test/manifest.json

@@ -11,7 +11,6 @@
     }
   },
   "permissions": [
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem"]

chrome/test/data/extensions/api_test/file_browser/drive_search_test/manifest.json

@@ -11,7 +11,6 @@
     }
   },
   "permissions": [
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {"fileSystem": ["requestFileSystem"]}
   ]

chrome/test/data/extensions/api_test/file_browser/file_watcher_test/manifest.json

@@ -11,7 +11,6 @@
     }
   },
   "permissions": [
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem", "write"]

chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/manifest.json

@@ -11,7 +11,6 @@
     }
   },
   "permissions": [
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem", "write"]

chrome/test/data/extensions/api_test/file_browser/handler_test_runner/manifest.json

@@ -11,7 +11,6 @@
     }
   },
   "permissions": [
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem"]

chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/manifest.json

@@ -11,7 +11,6 @@
     }
   },
   "permissions": [
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem", "write"]

chrome/test/data/extensions/api_test/file_system_provider/add_watcher/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/big_file/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/copy_entry/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/create_directory/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/create_file/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/delete_entry/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/evil/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/get_all/manifest.json

@@ -10,8 +10,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/get_metadata/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/mime_type/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "file_handlers": {
     "magic_handler": {

chrome/test/data/extensions/api_test/file_system_provider/move_entry/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/notify/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/read_file/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/remove_watcher/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/thumbnail/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/truncate/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/file_system_provider/write_file/manifest.json

@@ -11,8 +11,7 @@
     {
       "fileSystem": ["requestFileSystem", "write"]
     },
-    "fileManagerPrivate",
-    "fileBrowserHandler"
+    "fileManagerPrivate"
   ],
   "app": {
     "background": {

chrome/test/data/extensions/api_test/stubs_app/manifest.json

@@ -15,7 +15,6 @@
     "clipboardWrite",
     "contextMenus",
     "desktopCapture",
-    "fileBrowserHandler",
     "fileSystem",
     "gcm",
     "geolocation",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_access_permission.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_access_permission_list.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_action_id.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "default_title" : "Test",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_action_title.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_actions_1.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": {
   }
 }

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_actions_2.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     "bad"
   ]

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_empty_access_permission_list.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_file_filters_1.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_file_filters_2.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_invalid_file_filters_url.json

 {
   "name": "test",
   "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
   "file_browser_handlers": [
     {
       "id" : "ID",

chrome/test/data/extensions/manifest_tests/filebrowser_valid.json

+{
+  "name": "test",
+  "version": "1",
+  "permissions": [
+    "fileBrowserHandler"
+  ],
+  "file_browser_handlers": [
+    {
+      "id" : "ID",
+      "default_title" : "Test",
+      "default_icon" : "icon.png",
+      "file_filters" : [
+        "filesystem:*.html"
+      ]
+    }
+  ]
+}

chrome/test/ext_auto/auto_provider/manifest.json

@@ -31,7 +31,6 @@
      "declarativeWebRequest",
      "downloads",
      "experimental",
-     "fileBrowserHandler",
      "fileManagerPrivate",
      "fileSystem",
      "fileSystem.write",

content/public/test/mock_special_storage_policy.cc

@@ -30,10 +30,6 @@ bool MockSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) {
   return ContainsKey(can_query_disk_size_, origin);
 }
 
-bool MockSpecialStoragePolicy::IsFileHandler(const std::string& extension_id) {
-  return ContainsKey(file_handlers_, extension_id);
-}
-
 bool MockSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
   return ContainsKey(isolated_, origin);
 }

content/public/test/mock_special_storage_policy.h

@@ -23,7 +23,6 @@ class MockSpecialStoragePolicy : public storage::SpecialStoragePolicy {
   bool IsStorageUnlimited(const GURL& origin) override;
   bool IsStorageSessionOnly(const GURL& origin) override;
   bool CanQueryDiskSize(const GURL& origin) override;
-  bool IsFileHandler(const std::string& extension_id) override;
   bool HasIsolatedStorage(const GURL& origin) override;
   bool HasSessionOnlyOrigins() override;
 
@@ -47,10 +46,6 @@ class MockSpecialStoragePolicy : public storage::SpecialStoragePolicy {
     can_query_disk_size_.insert(origin);
   }
 
-  void AddFileHandler(const std::string& id) {
-    file_handlers_.insert(id);
-  }
-
   void AddIsolated(const GURL& origin) {
     isolated_.insert(origin);
   }

extensions/shell/browser/shell_special_storage_policy.cc

@@ -32,10 +32,6 @@ bool ShellSpecialStoragePolicy::HasSessionOnlyOrigins() {
   return false;
 }
 
-bool ShellSpecialStoragePolicy::IsFileHandler(const std::string& extension_id) {
-  return true;
-}
-
 bool ShellSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
   return false;
 }

extensions/shell/browser/shell_special_storage_policy.h

@@ -20,7 +20,6 @@ class ShellSpecialStoragePolicy : public storage::SpecialStoragePolicy {
   bool IsStorageUnlimited(const GURL& origin) override;
   bool IsStorageSessionOnly(const GURL& origin) override;
   bool CanQueryDiskSize(const GURL& origin) override;
-  bool IsFileHandler(const std::string& extension_id) override;
   bool HasIsolatedStorage(const GURL& origin) override;
   bool HasSessionOnlyOrigins() override;
 

storage/browser/quota/special_storage_policy.h

@@ -52,10 +52,6 @@ class STORAGE_EXPORT SpecialStoragePolicy
   // disk capacity.
   virtual bool CanQueryDiskSize(const GURL& origin) = 0;
 
-  // Checks if extension identified with |extension_id| is registered as
-  // file handler.
-  virtual bool IsFileHandler(const std::string& extension_id) = 0;
-
   // Checks if the origin contains per-site isolated storage.
   virtual bool HasIsolatedStorage(const GURL& origin) = 0;
 

ui/file_manager/audio_player/manifest.json

@@ -19,7 +19,6 @@
   "permissions": [
     "commandLinePrivate",
     "fileSystem",
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem", "write"]

ui/file_manager/gallery/manifest.json

@@ -21,7 +21,6 @@
     "chrome://extension-icon/",
     "chrome://resources/",
     "chrome://theme/",
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem", "write"]

ui/file_manager/image_loader/manifest.json

@@ -7,7 +7,6 @@
   "incognito" : "split",
   "manifest_version": 2,
   "permissions": [
-    "fileBrowserHandler",
     {
       "fileSystem": ["requestFileSystem"]
     },

ui/file_manager/video_player/manifest.json

@@ -19,7 +19,6 @@
   "permissions": [
     "commandLinePrivate",
     "fileSystem",
-    "fileBrowserHandler",
     "fileManagerPrivate",
     {
       "fileSystem": ["requestFileSystem", "write"]