| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/stl_util.h" | 5 #include "base/stl_util.h" |
| 6 #include "chrome/browser/chromeos/file_manager/drive_test_util.h" | 6 #include "chrome/browser/chromeos/file_manager/drive_test_util.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chromeos/dbus/cros_disks_client.h" | 8 #include "chromeos/dbus/cros_disks_client.h" |
| 9 #include "chromeos/disks/mock_disk_mount_manager.h" | 9 #include "chromeos/disks/mock_disk_mount_manager.h" |
| 10 #include "extensions/common/extension.h" | 10 #include "extensions/common/extension.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 : disk_mount_manager_mock_(NULL) { | 116 : disk_mount_manager_mock_(NULL) { |
| 117 InitMountPoints(); | 117 InitMountPoints(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 virtual ~FileManagerPrivateApiTest() { | 120 virtual ~FileManagerPrivateApiTest() { |
| 121 DCHECK(!disk_mount_manager_mock_); | 121 DCHECK(!disk_mount_manager_mock_); |
| 122 STLDeleteValues(&volumes_); | 122 STLDeleteValues(&volumes_); |
| 123 } | 123 } |
| 124 | 124 |
| 125 // ExtensionApiTest override | 125 // ExtensionApiTest override |
| 126 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 126 virtual void SetUpInProcessBrowserTestFixture() override { |
| 127 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 127 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
| 128 | 128 |
| 129 disk_mount_manager_mock_ = new chromeos::disks::MockDiskMountManager; | 129 disk_mount_manager_mock_ = new chromeos::disks::MockDiskMountManager; |
| 130 chromeos::disks::DiskMountManager::InitializeForTesting( | 130 chromeos::disks::DiskMountManager::InitializeForTesting( |
| 131 disk_mount_manager_mock_); | 131 disk_mount_manager_mock_); |
| 132 disk_mount_manager_mock_->SetupDefaultReplies(); | 132 disk_mount_manager_mock_->SetupDefaultReplies(); |
| 133 | 133 |
| 134 // OVERRIDE mock functions. | 134 // override mock functions. |
| 135 ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).WillByDefault( | 135 ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).WillByDefault( |
| 136 Invoke(this, &FileManagerPrivateApiTest::FindVolumeBySourcePath)); | 136 Invoke(this, &FileManagerPrivateApiTest::FindVolumeBySourcePath)); |
| 137 EXPECT_CALL(*disk_mount_manager_mock_, disks()) | 137 EXPECT_CALL(*disk_mount_manager_mock_, disks()) |
| 138 .WillRepeatedly(ReturnRef(volumes_)); | 138 .WillRepeatedly(ReturnRef(volumes_)); |
| 139 EXPECT_CALL(*disk_mount_manager_mock_, mount_points()) | 139 EXPECT_CALL(*disk_mount_manager_mock_, mount_points()) |
| 140 .WillRepeatedly(ReturnRef(mount_points_)); | 140 .WillRepeatedly(ReturnRef(mount_points_)); |
| 141 } | 141 } |
| 142 | 142 |
| 143 // ExtensionApiTest override | 143 // ExtensionApiTest override |
| 144 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { | 144 virtual void TearDownInProcessBrowserTestFixture() override { |
| 145 chromeos::disks::DiskMountManager::Shutdown(); | 145 chromeos::disks::DiskMountManager::Shutdown(); |
| 146 disk_mount_manager_mock_ = NULL; | 146 disk_mount_manager_mock_ = NULL; |
| 147 | 147 |
| 148 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); | 148 ExtensionApiTest::TearDownInProcessBrowserTestFixture(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 private: | 151 private: |
| 152 void InitMountPoints() { | 152 void InitMountPoints() { |
| 153 const TestMountPoint kTestMountPoints[] = { | 153 const TestMountPoint kTestMountPoints[] = { |
| 154 { | 154 { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 | 263 |
| 264 IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, Permissions) { | 264 IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, Permissions) { |
| 265 EXPECT_TRUE( | 265 EXPECT_TRUE( |
| 266 RunExtensionTestIgnoreManifestWarnings("file_browser/permissions")); | 266 RunExtensionTestIgnoreManifestWarnings("file_browser/permissions")); |
| 267 const extensions::Extension* extension = GetSingleLoadedExtension(); | 267 const extensions::Extension* extension = GetSingleLoadedExtension(); |
| 268 ASSERT_TRUE(extension); | 268 ASSERT_TRUE(extension); |
| 269 ASSERT_EQ(1u, extension->install_warnings().size()); | 269 ASSERT_EQ(1u, extension->install_warnings().size()); |
| 270 const extensions::InstallWarning& warning = extension->install_warnings()[0]; | 270 const extensions::InstallWarning& warning = extension->install_warnings()[0]; |
| 271 EXPECT_EQ("fileManagerPrivate", warning.key); | 271 EXPECT_EQ("fileManagerPrivate", warning.key); |
| 272 } | 272 } |
| OLD | NEW |