[SystemInfo API] Rename systemInfo Memory API.

chrome/browser/extensions/api/system_memory/system_memory_apitest.cc

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 84%
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 8170b1fdd308009af1b37c238a91a002090f0a4c..1999a7c7c26f427b802d5758cb497663e53f8367 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.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,7 +49,7 @@ 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);