[SystemInfo API] Move Storage API out of experimental namespace and rename to the "system" namespace

chrome/browser/extensions/api/system_storage/system_storage_apitest.cc

Index: chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
diff --git a/chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
similarity index 83%
rename from chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc
rename to chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
index 3c87491b263880a0614bf4e4aa4b958661b62cb7..6fc63387e31daf5bdd74767275507f5f4bf2287e 100644
--- a/chrome/browser/extensions/api/system_info_storage/system_info_storage_apitest.cc
+++ b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
@@ -5,8 +5,8 @@
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.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_test_message_listener.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
@@ -19,8 +19,8 @@ namespace {
 
 using chrome::StorageMonitor;
 using chrome::test::TestStorageMonitor;
-using extensions::api::experimental_system_info_storage::ParseStorageUnitType;
-using extensions::api::experimental_system_info_storage::StorageUnitInfo;
+using extensions::api::system_storage::ParseStorageUnitType;
+using extensions::api::system_storage::StorageUnitInfo;
 using extensions::StorageInfoProvider;
 using extensions::StorageUnitInfoList;
 using extensions::systeminfo::kStorageTypeFixed;
@@ -45,10 +45,10 @@ struct TestStorageUnitInfo kRemovableStorageData[] = {
 
 }  // namespace
 
-class SystemInfoStorageApiTest: public ExtensionApiTest {
+class SystemStorageApiTest: public ExtensionApiTest {
  public:
-  SystemInfoStorageApiTest() {}
-  virtual ~SystemInfoStorageApiTest() {}
+  SystemStorageApiTest() {}
+  virtual ~SystemStorageApiTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
@@ -79,14 +79,14 @@ class SystemInfoStorageApiTest: public ExtensionApiTest {
   scoped_ptr<base::MessageLoop> message_loop_;
 };
 
-IN_PROC_BROWSER_TEST_F(SystemInfoStorageApiTest, Storage) {
+IN_PROC_BROWSER_TEST_F(SystemStorageApiTest, Storage) {
   TestStorageInfoProvider* provider =
       new TestStorageInfoProvider(kTestingData, arraysize(kTestingData));
   StorageInfoProvider::InitializeForTesting(provider);
-  ASSERT_TRUE(RunPlatformAppTest("systeminfo/storage")) << message_;
+  ASSERT_TRUE(RunPlatformAppTest("system/storage")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(SystemInfoStorageApiTest, StorageAttachment) {
+IN_PROC_BROWSER_TEST_F(SystemStorageApiTest, StorageAttachment) {
   scoped_ptr<TestStorageMonitor> monitor(
       TestStorageMonitor::CreateForBrowserTests());
 
@@ -100,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(SystemInfoStorageApiTest, StorageAttachment) {
   ExtensionTestMessageListener detach_listener("detach", false);
 
   EXPECT_TRUE(LoadExtension(
-      test_data_dir_.AppendASCII("systeminfo/storage_attachment")));
+      test_data_dir_.AppendASCII("system/storage_attachment")));
 
   // Simulate triggering onAttached event.
   ASSERT_TRUE(attach_listener.WaitUntilSatisfied());