Move the check for fileBrowserHandler permission to FileBrowserHandler.

chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc

Index: chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc b/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc
index cf304963c36d2bf6b1baef3396f9e78a805cc902..f163faf3ecde89bd21668ac5aadb804542a49d70 100644
--- a/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc
+++ b/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());