| Index: chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
|
| index 750611056aebde48c6c22ae71fa505c3df1b40b7..b307852b1f95149f258cb095ebaa1d2839454281 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
|
| @@ -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_;
|
| }
|
|
|