Add SandboxPrioritizedOriginDatabase support for dump_file_system

storage/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]...
 //
 // If no origin is specified, this dumps all origins in the profile dir.
+// For Chrome App, which has a separate storage directory, specify "primary"
+// as the origin name.
 //
 // Available options:
 //
 // -t : dumps temporary files instead of persistent.
 // -s : dumps syncable files instead of persistent.
 // -l : more information will be displayed.
 //
 // The format of -l option is:
 //
 // === ORIGIN origin_name origin_dir ===
@@ skipping 13 matching lines @@
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "storage/browser/fileapi/obfuscated_file_util.h"
 #include "storage/browser/fileapi/sandbox_directory_database.h"
 #include "storage/browser/fileapi/sandbox_file_system_backend.h"
 #include "storage/browser/fileapi/sandbox_origin_database.h"
+#include "storage/browser/fileapi/sandbox_prioritized_origin_database.h"
 #include "storage/common/fileapi/file_system_types.h"
 #include "storage/common/fileapi/file_system_util.h"
 
 namespace {
 
 bool g_opt_long;
 const char* g_opt_fs_type = "p";
 
 void ShowMessageAndExit(const std::string& msg) {
   fprintf(stderr, "%s\n", msg.c_str());
@@ skipping 69 matching lines @@
              directory_suffix,
              id,
              size,
              FilePathToString(info.data_path).c_str());
     } else {
       printf("%s%s\n", display_name, directory_suffix);
     }
   }
 }
 
-static void DumpOrigin(const base::FilePath& file_system_dir,
-                       const std::string& origin_name) {
+static base::FilePath GetOriginDir(const base::FilePath& file_system_dir,
+                                   const std::string& origin_name) {
+  if (base::PathExists(file_system_dir.Append(
+          SandboxPrioritizedOriginDatabase::kPrimaryOriginFile))) {
+    return base::FilePath(
+        SandboxPrioritizedOriginDatabase::kPrimaryOriginFile);
+  }
+
   SandboxOriginDatabase origin_db(file_system_dir, NULL);
   base::FilePath origin_dir;
   if (!origin_db.HasOriginPath(origin_name)) {
     ShowMessageAndExit("Origin " + origin_name + " is not in " +
                        FilePathToString(file_system_dir));
   }
 
   if (!origin_db.GetPathForOrigin(origin_name, &origin_dir)) {
     ShowMessageAndExit("Failed to get path of origin " + origin_name +
                        " in " + FilePathToString(file_system_dir));
   }
+
+  return origin_dir;
+}
+
+static void DumpOrigin(const base::FilePath& file_system_dir,
+                       const std::string& origin_name) {
+  base::FilePath origin_dir = GetOriginDir(file_system_dir, origin_name);
   DumpDirectoryTree(origin_name, file_system_dir.Append(origin_dir));
 }
 
 static void DumpFileSystem(const base::FilePath& file_system_dir) {
   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));
@@ skipping 38 matching lines @@
 
   if (argc == 2) {
     storage::DumpFileSystem(file_system_dir);
   } else {
     for (int i = 2; i < argc; i++) {
       storage::DumpOrigin(file_system_dir, argv[i]);
     }
   }
   return 0;
 }