Move the check for fileBrowserHandler permission to FileBrowserHandler.

chrome/browser/chromeos/fileapi/file_system_backend_unittest.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 <set>
 
 #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"
 #include "url/url_util.h"
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 using storage::ExternalMountPoints;
 using storage::FileSystemURL;
 
 namespace {
 
 FileSystemURL CreateFileSystemURL(const std::string& extension,
                                   const char* path,
                                   ExternalMountPoints* mount_points) {
   return mount_points->CreateCrackedFileSystemURL(
       GURL("chrome-extension://" + extension + "/"),
       storage::kFileSystemTypeExternal,
       base::FilePath::FromUTF8Unsafe(path));
 }
 
 TEST(ChromeOSFileSystemBackendTest, DefaultMountPoints) {
   // Make sure no system-level mount points are registered before testing
   // 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();
   std::vector<base::FilePath> root_dirs = backend.GetRootDirectories();
   std::set<base::FilePath> root_dirs_set(root_dirs.begin(), root_dirs.end());
 
   // By default there should be 3 mount points (in system mount points):
   EXPECT_EQ(3u, root_dirs.size());
 
   EXPECT_TRUE(root_dirs_set.count(
       chromeos::CrosDisksClient::GetRemovableDiskMountPoint()));
   EXPECT_TRUE(root_dirs_set.count(
       chromeos::CrosDisksClient::GetArchiveMountPoint()));
   EXPECT_TRUE(root_dirs_set.count(base::FilePath(FPL("/usr/share/oem"))));
 }
 
 TEST(ChromeOSFileSystemBackendTest, GetRootDirectories) {
-  scoped_refptr<storage::SpecialStoragePolicy> storage_policy =
-      new content::MockSpecialStoragePolicy();
   scoped_refptr<storage::ExternalMountPoints> mount_points(
       storage::ExternalMountPoints::CreateRefCounted());
 
   scoped_refptr<storage::ExternalMountPoints> system_mount_points(
       storage::ExternalMountPoints::CreateRefCounted());
 
   chromeos::FileSystemBackend backend(NULL,  // drive_delegate
                                       NULL,  // file_system_provider_delegate
                                       NULL,  // mtp_delegate
-                                      storage_policy,
                                       mount_points.get(),
                                       system_mount_points.get());
 
   const size_t initial_root_dirs_size = backend.GetRootDirectories().size();
 
   // Register 'local' test mount points.
   mount_points->RegisterFileSystem("c",
                                    storage::kFileSystemTypeNativeLocal,
                                    storage::FileSystemMountOption(),
                                    base::FilePath(FPL("/a/b/c")));
@@ skipping 17 matching lines @@
   EXPECT_EQ(initial_root_dirs_size + 4, root_dirs.size());
   EXPECT_TRUE(root_dirs_set.count(base::FilePath(FPL("/a/b/c"))));
   EXPECT_TRUE(root_dirs_set.count(base::FilePath(FPL("/b/c/d"))));
   EXPECT_TRUE(root_dirs_set.count(base::FilePath(FPL("/g/c/d"))));
   EXPECT_TRUE(root_dirs_set.count(base::FilePath(FPL("/g/d/e"))));
 }
 
 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(
       storage::ExternalMountPoints::CreateRefCounted());
   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",
       storage::kFileSystemTypeNativeLocal,
       storage::FileSystemMountOption(),
       base::FilePath(FPL("/g/system"))));
   ASSERT_TRUE(mount_points->RegisterFileSystem(
       "removable",
       storage::kFileSystemTypeNativeLocal,
       storage::FileSystemMountOption(),
@@ skipping 36 matching lines @@
                                        base::FilePath(FPL("/foo/test"))));
   EXPECT_FALSE(backend.IsAccessAllowed(
       CreateFileSystemURL(extension, "test_/foo", mount_points.get())));
 
   backend.RevokeAccessForExtension(extension);
   EXPECT_FALSE(backend.IsAccessAllowed(
       CreateFileSystemURL(extension, "removable/foo", mount_points.get())));
 }
 
 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(
       storage::ExternalMountPoints::CreateRefCounted());
   chromeos::FileSystemBackend backend(NULL,  // drive_delegate
                                       NULL,  // file_system_provider_delegate
                                       NULL,  // mtp_delegate
-                                      storage_policy,
                                       mount_points.get(),
                                       system_mount_points.get());
 
   const storage::FileSystemType type = storage::kFileSystemTypeNativeLocal;
   const storage::FileSystemMountOption option =
       storage::FileSystemMountOption();
 
   // Backend specific mount points.
   ASSERT_TRUE(mount_points->RegisterFileSystem(
       "b", type, option, base::FilePath(FPL("/a/b"))));
@@ skipping 43 matching lines @@
     if (!kTestCases[i].success)
       continue;
 
     base::FilePath expected_virtual_path(kTestCases[i].virtual_path);
     EXPECT_EQ(expected_virtual_path, virtual_path)
         << "Resolving " << kTestCases[i].local_path;
   }
 }
 
 }  // namespace