Use CategoryFilter::kDefaultCategoryFilterString instead of "*" as the default category

build/android/adb_profile_chrome.py

Index: build/android/adb_profile_chrome.py
diff --git a/build/android/adb_profile_chrome.py b/build/android/adb_profile_chrome.py
index c8cea89ceb2406430293fed702220fae239ea433..e1dacff6d8f28119e9428db46ff97da1a6f1203f 100755
--- a/build/android/adb_profile_chrome.py
+++ b/build/android/adb_profile_chrome.py
@@ -21,6 +21,9 @@ from pylib import constants
 from pylib import pexpect
 
 
+_DEFAULT_CHROME_CATEGORIES = '_DEFAULT_CHROME_CATEGORIES'

[Sami, 2013/10/16 09:43:34]

Instead of sending this string to Chrome, could we check for it below in
ChromeTracingController and not set any categories in the intent if it matches?

[Xianzhu, 2013/10/16 16:47:48]

I had thought so but later found when --trace-cc or --trace-gpu is used, we need
the string to tell chrome not just the cc/gpu disabled-by-default categories are
enabled.

+
+
 def _GetTraceTimestamp():
  return time.strftime('%Y-%m-%d-%H%M%S', time.localtime())
 
@@ -287,15 +290,19 @@ def main():
   parser.add_option_group(cont_options)
 
   categories = optparse.OptionGroup(parser, 'Trace categories')
-  categories.add_option('-c', '--categories', help='Select categories to trace '
-                        'with comma-delimited wildcards, e.g., '
-                        '"*", "cat1*,-cat1a". Default is "*".', default='*',
-                        dest='chrome_categories')
+  categories.add_option('-c', '--categories', help='Select Chrome tracing '
+                        'categories with comma-delimited wildcards, '
+                        'e.g., "*", "cat1*,-cat1a". Omit this option to trace '
+                        'Chrome\'s default categories. Chrome tracing can be '
+                        'disabled with "--categories=\'\'".',
+                        metavar='CHROME_CATEGORIES', dest='chrome_categories',
+                        default=_DEFAULT_CHROME_CATEGORIES)
   categories.add_option('-s', '--systrace', help='Capture a systrace with the '
                         'chosen comma-delimited systrace categories. You can '
                         'also capture a combined Chrome + systrace by enabling '
                         'both types of categories. Use "list" to see the '
-                        'available categories.', metavar='SYS_CATEGORIES',
+                        'available categories. Systrace is disabled by '
+                        'default.', metavar='SYS_CATEGORIES',
                         dest='systrace_categories', default='')
   categories.add_option('--trace-cc', help='Enable extra trace categories for '
                         'compositor frame viewer data.', action='store_true')