| Index: chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
|
| similarity index 88%
|
| rename from chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc
|
| rename to chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
|
| index ba519930262ac9de1f87231e33002944ad104783..85cfac91bb4883e1b1525b74651b0a23cb2b60eb 100644
|
| --- a/chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc
|
| +++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc
|
| @@ -7,8 +7,8 @@
|
| #include "base/files/file_path.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"
|
| -#include "chrome/browser/extensions/api/system_info_storage/test_storage_info_provider.h"
|
| +#include "chrome/browser/extensions/api/system_storage/storage_info_provider.h"
|
| +#include "chrome/browser/extensions/api/system_storage/test_storage_info_provider.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/extensions/extension_process_manager.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| @@ -33,10 +33,10 @@ struct TestStorageUnitInfo kRemovableStorageData[] = {
|
|
|
| } // namespace
|
|
|
| -class SystemInfoStorageEjectApiTest : public ExtensionApiTest {
|
| +class SystemStorageEjectApiTest : public ExtensionApiTest {
|
| public:
|
| - SystemInfoStorageEjectApiTest() {}
|
| - virtual ~SystemInfoStorageEjectApiTest() {}
|
| + SystemStorageEjectApiTest() {}
|
| + virtual ~SystemStorageEjectApiTest() {}
|
|
|
| protected:
|
| // ExtensionApiTest overrides.
|
| @@ -47,7 +47,7 @@ class SystemInfoStorageEjectApiTest : public ExtensionApiTest {
|
|
|
| content::RenderViewHost* GetHost() {
|
| const extensions::Extension* extension =
|
| - LoadExtension(test_data_dir_.AppendASCII("systeminfo/storage_eject"));
|
| + LoadExtension(test_data_dir_.AppendASCII("system/storage_eject"));
|
| return extensions::ExtensionSystem::Get(browser()->profile())->
|
| process_manager()->GetBackgroundHostForExtension(extension->id())->
|
| render_view_host();
|
| @@ -76,11 +76,11 @@ class SystemInfoStorageEjectApiTest : public ExtensionApiTest {
|
| }
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(SystemInfoStorageEjectApiTest);
|
| + DISALLOW_COPY_AND_ASSIGN(SystemStorageEjectApiTest);
|
| };
|
|
|
|
|
| -IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectTest) {
|
| +IN_PROC_BROWSER_TEST_F(SystemStorageEjectApiTest, EjectTest) {
|
| scoped_ptr<chrome::test::TestStorageMonitor> monitor(
|
| chrome::test::TestStorageMonitor::CreateForBrowserTests());
|
| monitor->Init();
|
| @@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectTest) {
|
| Detach();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectBadDeviceTest) {
|
| +IN_PROC_BROWSER_TEST_F(SystemStorageEjectApiTest, EjectBadDeviceTest) {
|
| scoped_ptr<chrome::test::TestStorageMonitor> monitor(
|
| chrome::test::TestStorageMonitor::CreateForBrowserTests());
|
| monitor->Init();
|
|
|