| Index: chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
|
| similarity index 80%
|
| rename from chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc
|
| rename to chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
|
| index 0f070ec77ef2017f3142647cc316c6f148ccbbd3..c83d6bd0843a3b4be0bc74d970e68ef44d1bbd5b 100644
|
| --- a/chrome/browser/extensions/api/system_info_memory/system_info_memory_apitest.cc
|
| +++ b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/message_loop/message_loop.h"
|
| -#include "chrome/browser/extensions/api/system_info_memory/memory_info_provider.h"
|
| +#include "chrome/browser/extensions/api/system_memory/memory_info_provider.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/extensions/extension_test_message_listener.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -12,7 +12,7 @@
|
|
|
| namespace extensions {
|
|
|
| -using api::system_info_memory::MemoryInfo;
|
| +using api::system_memory::MemoryInfo;
|
|
|
| const char kExtensionId[] = "lfmcnjhchhgejbpbonjobnlbcgcnmjif";
|
|
|
| @@ -29,10 +29,10 @@ class MockMemoryInfoProviderImpl : public MemoryInfoProvider {
|
| virtual ~MockMemoryInfoProviderImpl() {}
|
| };
|
|
|
| -class SystemInfoMemoryApiTest: public ExtensionApiTest {
|
| +class SystemMemoryApiTest: public ExtensionApiTest {
|
| public:
|
| - SystemInfoMemoryApiTest() {}
|
| - virtual ~SystemInfoMemoryApiTest() {}
|
| + SystemMemoryApiTest() {}
|
| + virtual ~SystemMemoryApiTest() {}
|
|
|
| virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| @@ -49,11 +49,11 @@ class SystemInfoMemoryApiTest: public ExtensionApiTest {
|
| scoped_ptr<base::MessageLoop> message_loop_;
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(SystemInfoMemoryApiTest, Memory) {
|
| +IN_PROC_BROWSER_TEST_F(SystemMemoryApiTest, Memory) {
|
| scoped_refptr<MemoryInfoProvider> provider = new MockMemoryInfoProviderImpl();
|
| // The provider is owned by the single MemoryInfoProvider instance.
|
| MemoryInfoProvider::InitializeForTesting(provider);
|
| - ASSERT_TRUE(RunExtensionTest("systeminfo/memory")) << message_;
|
| + ASSERT_TRUE(RunExtensionTest("system/memory")) << message_;
|
| }
|
|
|
| } // namespace extensions
|
|
|