| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ | 6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 void RunTestMessageLoop(); | 52 void RunTestMessageLoop(); |
| 53 | 53 |
| 54 // Overriding point for test configurations. | 54 // Overriding point for test configurations. |
| 55 virtual const char* GetTestManifestName() const = 0; | 55 virtual const char* GetTestManifestName() const = 0; |
| 56 virtual GuestMode GetGuestModeParam() const = 0; | 56 virtual GuestMode GetGuestModeParam() const = 0; |
| 57 virtual const char* GetTestCaseNameParam() const = 0; | 57 virtual const char* GetTestCaseNameParam() const = 0; |
| 58 virtual void OnMessage(const std::string& name, | 58 virtual void OnMessage(const std::string& name, |
| 59 const base::DictionaryValue& value, | 59 const base::DictionaryValue& value, |
| 60 std::string* output); | 60 std::string* output); |
| 61 | 61 |
| 62 scoped_ptr<LocalTestVolume> local_volume_; | 62 std::unique_ptr<LocalTestVolume> local_volume_; |
| 63 linked_ptr<DriveTestVolume> drive_volume_; | 63 linked_ptr<DriveTestVolume> drive_volume_; |
| 64 std::map<Profile*, linked_ptr<DriveTestVolume>> drive_volumes_; | 64 std::map<Profile*, linked_ptr<DriveTestVolume>> drive_volumes_; |
| 65 scoped_ptr<FakeTestVolume> usb_volume_; | 65 std::unique_ptr<FakeTestVolume> usb_volume_; |
| 66 scoped_ptr<FakeTestVolume> mtp_volume_; | 66 std::unique_ptr<FakeTestVolume> mtp_volume_; |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 drive::DriveIntegrationService* CreateDriveIntegrationService( | 69 drive::DriveIntegrationService* CreateDriveIntegrationService( |
| 70 Profile* profile); | 70 Profile* profile); |
| 71 drive::DriveIntegrationServiceFactory::FactoryCallback | 71 drive::DriveIntegrationServiceFactory::FactoryCallback |
| 72 create_drive_integration_service_; | 72 create_drive_integration_service_; |
| 73 scoped_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest> | 73 std::unique_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest> |
| 74 service_factory_for_test_; | 74 service_factory_for_test_; |
| 75 }; | 75 }; |
| 76 | 76 |
| 77 } // namespace file_manager | 77 } // namespace file_manager |
| 78 | 78 |
| 79 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ | 79 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ |
| OLD | NEW |