summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PRESUBMIT.py2
-rw-r--r--storage/browser/fileapi/dump_file_system.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 11123c1..a233991 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -967,7 +967,7 @@ def _CheckSpamLogging(input_api, output_api):
r"^sandbox[\\\/]linux[\\\/].*",
r"^tools[\\\/]",
r"^ui[\\\/]aura[\\\/]bench[\\\/]bench_main\.cc$",
- r"^webkit[\\\/]browser[\\\/]fileapi[\\\/]" +
+ r"^storage[\\\/]browser[\\\/]fileapi[\\\/]" +
r"dump_file_system.cc$",))
source_file_filter = lambda x: input_api.FilterSourceFile(
x, white_list=(file_inclusion_pattern,), black_list=black_list)
diff --git a/storage/browser/fileapi/dump_file_system.cc b/storage/browser/fileapi/dump_file_system.cc
index 8a02b8c..6707fac 100644
--- a/storage/browser/fileapi/dump_file_system.cc
+++ b/storage/browser/fileapi/dump_file_system.cc
@@ -51,7 +51,7 @@
namespace {
bool g_opt_long;
-const char* g_opt_fs_type = "p";
+const base::FilePath::CharType* g_opt_fs_type = FILE_PATH_LITERAL("p");
void ShowMessageAndExit(const std::string& msg) {
fprintf(stderr, "%s\n", msg.c_str());
@@ -187,11 +187,11 @@ int main(int argc, char* argv[]) {
argc--;
argv++;
} else if (std::string(argv[1]) == "-t") {
- g_opt_fs_type = "t";
+ g_opt_fs_type = FILE_PATH_LITERAL("t");
argc--;
argv++;
} else if (std::string(argv[1]) == "-s") {
- g_opt_fs_type = "s";
+ g_opt_fs_type = FILE_PATH_LITERAL("s");
argc--;
argv++;
} else {