From 10bc4e3b570ce253ccd4be34b146719669bbedda Mon Sep 17 00:00:00 2001
From: zpeng <zpeng@chromium.org>
Date: Thu, 29 Jun 2017 13:38:55 -0700
Subject: [PATCH] Fix nits in generate_resource_whitelist.*

Review-Url: https://codereview.chromium.org/2968523002
Cr-Commit-Position: refs/heads/master@{#483477}
---
 .../resources/generate_resource_whitelist.gni |  6 ++---
 .../resources/generate_resource_whitelist.py  | 25 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/tools/resources/generate_resource_whitelist.gni b/tools/resources/generate_resource_whitelist.gni
index 6740325a09b09a..33bc4b87a47159 100644
--- a/tools/resources/generate_resource_whitelist.gni
+++ b/tools/resources/generate_resource_whitelist.gni
@@ -37,11 +37,11 @@ template("generate_resource_whitelist") {
     ]
 
     args = [
-      "-i",
+      "--input",
       rebase_path(invoker.input, root_build_dir),
-      "-o",
+      "--output",
       rebase_path(invoker.output, root_build_dir),
-      "--out-dir=.",
+      "--output-directory=.",
     ]
   }
 }
diff --git a/tools/resources/generate_resource_whitelist.py b/tools/resources/generate_resource_whitelist.py
index 1a7d7824fa62ac..19989274d405ee 100755
--- a/tools/resources/generate_resource_whitelist.py
+++ b/tools/resources/generate_resource_whitelist.py
@@ -3,12 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import argparse
-import os
-import re
-import sys
-
-USAGE = """generate_resource_whitelist.py [-h] [-i INPUT] [-o OUTPUT]
+__doc__ = """generate_resource_whitelist.py [-h] [--input INPUT]
+[--output OUTPUT]
 
 INPUT specifies a file containing existing resource IDs that should be
 whitelisted, where each line of INPUT contains a single resource ID.
@@ -27,9 +23,14 @@
 [-Wunknown-pragmas]
 
 On Windows, the message is simply a message via __pragma(message(...)).
-
 """
 
+import argparse
+import os
+import re
+import sys
+
+
 COMPONENTS_STRINGS_HEADER = 'gen/components/strings/grit/components_strings.h'
 
 # We don't want the resources are different between 32-bit and 64-bit build,
@@ -56,16 +57,16 @@ def _FindResourceIds(header, resource_names):
 
 
 def main():
-  parser = argparse.ArgumentParser(usage=USAGE)
+  parser = argparse.ArgumentParser(usage=__doc__)
   parser.add_argument(
-      '-i', '--input', type=argparse.FileType('r'), default=sys.stdin,
+      '--input', type=argparse.FileType('r'), default=sys.stdin,
       help='A resource whitelist where each line contains one resource ID')
   parser.add_argument(
-      '-o', '--output', type=argparse.FileType('w'), default=sys.stdout,
+      '--output', type=argparse.FileType('w'), default=sys.stdout,
       help='The resource list path to write (default stdout)')
   parser.add_argument(
-      '--out-dir', required=True,
-      help='The out target directory, for example out/Release')
+      '--output-directory', required=True,
+      help='The output target directory, for example out/Release')
 
   args = parser.parse_args()