Commit e61724d6 authored by satorux@chromium.org's avatar satorux@chromium.org

file_manager: Move mount test stuff to c/t/d/extensions/api_test/file_browser

To consolidate fileBrowserPrivate tests into a single directory.
Als add OWNERS, so Files.app team can add tests without approval
from extensions owners.

BUG=231782
TEST=none
R=benwells@chromium.org, yoshiki@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221987 0039d316-1c4b-4281-b951-d872f2087c98
parent a303e8e0
......@@ -106,14 +106,14 @@ TestDiskInfo kTestDisks[] = {
} // namespace
class ExtensionFileBrowserPrivateApiTest : public ExtensionApiTest {
class FileBrowserPrivateApiTest : public ExtensionApiTest {
public:
ExtensionFileBrowserPrivateApiTest()
FileBrowserPrivateApiTest()
: disk_mount_manager_mock_(NULL) {
InitMountPoints();
}
virtual ~ExtensionFileBrowserPrivateApiTest() {
virtual ~FileBrowserPrivateApiTest() {
DCHECK(!disk_mount_manager_mock_);
STLDeleteValues(&volumes_);
}
......@@ -130,7 +130,7 @@ class ExtensionFileBrowserPrivateApiTest : public ExtensionApiTest {
// OVERRIDE FindDiskBySourcePath mock function.
ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).
WillByDefault(Invoke(
this, &ExtensionFileBrowserPrivateApiTest::FindVolumeBySourcePath));
this, &FileBrowserPrivateApiTest::FindVolumeBySourcePath));
}
// ExtensionApiTest override
......@@ -233,7 +233,7 @@ class ExtensionFileBrowserPrivateApiTest : public ExtensionApiTest {
DiskMountManager::MountPointMap mount_points_;
};
IN_PROC_BROWSER_TEST_F(ExtensionFileBrowserPrivateApiTest, FileBrowserMount) {
IN_PROC_BROWSER_TEST_F(FileBrowserPrivateApiTest, Mount) {
// We will call fileBrowserPrivate.unmountVolume once. To test that method, we
// check that UnmountPath is really called with the same value.
EXPECT_CALL(*disk_mount_manager_mock_, UnmountPath(_, _, _))
......@@ -250,5 +250,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionFileBrowserPrivateApiTest, FileBrowserMount) {
EXPECT_CALL(*disk_mount_manager_mock_, mount_points())
.WillRepeatedly(ReturnRef(mount_points_));
ASSERT_TRUE(RunComponentExtensionTest("filebrowser_mount")) << message_;
ASSERT_TRUE(RunComponentExtensionTest("file_browser/mount_test"))
<< message_;
}
yoshiki@chromium.org
mtomasz@chromium.org
hirono@chromium.org
mtomasz@chromium.org
yoshiki@chromium.org
# This should match chrome/browser/resources/file_manager/OWNERS
hirono@chromium.org
mtomasz@chromium.org
yoshiki@chromium.org
# This should match chrome/browser/resources/file_manager/OWNERS
hirono@chromium.org
mtomasz@chromium.org
yoshiki@chromium.org
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment