Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

webkit/browser/fileapi/dump_file_system.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A tool to dump HTML5 filesystem from CUI.
 //
 // Usage:
 //
 // ./out/Release/dump_file_system [options] <filesystem dir> [origin]...
 //
@@ skipping 45 matching lines @@
 }
 
 void ShowUsageAndExit(const std::string& arg0) {
   ShowMessageAndExit(
       "Usage: " + arg0 +
       " [-l] [-t] [-s] <filesystem dir> [origin]...");
 }
 
 }  // namespace
 
-namespace fileapi {
+namespace storage {
 
 static void DumpDirectoryTree(const std::string& origin_name,
                               base::FilePath origin_dir) {
   origin_dir = origin_dir.Append(g_opt_fs_type);
 
   printf("=== ORIGIN %s %s ===\n",
          origin_name.c_str(), FilePathToString(origin_dir).c_str());
 
   if (!base::DirectoryExists(origin_dir))
     return;
@@ skipping 74 matching lines @@
   SandboxOriginDatabase origin_db(file_system_dir, NULL);
   std::vector<SandboxOriginDatabase::OriginRecord> origins;
   origin_db.ListAllOrigins(&origins);
   for (size_t i = 0; i < origins.size(); i++) {
     const SandboxOriginDatabase::OriginRecord& origin = origins[i];
     DumpDirectoryTree(origin.origin, file_system_dir.Append(origin.path));
     puts("");
   }
 }
 
-}  // namespace fileapi
+}  // namespace storage
 
 int main(int argc, char* argv[]) {
   const char* arg0 = argv[0];
   std::string username = "Default";
   while (true) {
     if (argc < 2)
       ShowUsageAndExit(arg0);
 
     if (std::string(argv[1]) == "-l") {
       g_opt_long = true;
       argc--;
       argv++;
     } else if (std::string(argv[1]) == "-t") {
       g_opt_fs_type = "t";
       argc--;
       argv++;
     } else if (std::string(argv[1]) == "-s") {
       g_opt_fs_type = "s";
       argc--;
       argv++;
     } else {
       break;
     }
   }
 
   if (argc < 2)
     ShowUsageAndExit(arg0);
 
-  const base::FilePath file_system_dir = fileapi::StringToFilePath(argv[1]);
+  const base::FilePath file_system_dir = storage::StringToFilePath(argv[1]);
   if (!base::DirectoryExists(file_system_dir)) {
-    ShowMessageAndExit(fileapi::FilePathToString(file_system_dir) +
+    ShowMessageAndExit(storage::FilePathToString(file_system_dir) +
                        " is not a filesystem directory");
   }
 
   if (argc == 2) {
-    fileapi::DumpFileSystem(file_system_dir);
+    storage::DumpFileSystem(file_system_dir);
   } else {
     for (int i = 2; i < argc; i++) {
-      fileapi::DumpOrigin(file_system_dir, argv[i]);
+      storage::DumpOrigin(file_system_dir, argv[i]);
     }
   }
   return 0;
 }