Add --trace-frame-viewer as a safer alternative to --trace-cc

build/android/adb_profile_chrome.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 import base64
 import gzip
 import logging
 import optparse
@@ skipping 307 matching lines @@
   finally:
     _StopTracing(controllers)
   if interval:
     _PrintMessage('done')
 
   return _PullTraces(controllers, output, compress, write_html)
 
 
 def _ComputeChromeCategories(options):
   categories = []
-  if options.trace_cc:
+  if options.trace_frame_viewer:
+    categories.append('disabled-by-default-cc.debug')
+  if options.trace_ubercompositor:
     categories.append('disabled-by-default-cc.debug*')
   if options.trace_gpu:
     categories.append('disabled-by-default-gpu.debug*')
   if options.chrome_categories:
     categories += options.chrome_categories.split(',')
   return categories
 
 
 def _ComputeSystraceCategories(options):
   if not options.systrace_categories:
@@ skipping 31 matching lines @@
                         '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. 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')
+  categories.add_option('--trace-cc',
+                        help='Deprecated, use --trace-frame-viewer.',
+                        action='store_true')
+  categories.add_option('--trace-frame-viewer',
+                        help='Enable enough trace categories for '
+                        'compositor frame viewing.', action='store_true')
+  categories.add_option('--trace-ubercompositor',
+                        help='Enable enough trace categories for '
+                        'ubercompositor frame data.', action='store_true')
   categories.add_option('--trace-gpu', help='Enable extra trace categories for '
                         'GPU data.', action='store_true')
   parser.add_option_group(categories)
 
   output_options = optparse.OptionGroup(parser, 'Output options')
   output_options.add_option('-o', '--output', help='Save trace output to file.')
   output_options.add_option('--html', help='Package trace into a standalone '
                             'html file.', action='store_true')
   output_options.add_option('--view', help='Open resulting trace file in a '
                             'browser.', action='store_true')
   parser.add_option_group(output_options)
 
   browsers = sorted(_GetSupportedBrowsers().keys())
   parser.add_option('-b', '--browser', help='Select among installed browsers. '
                     'One of ' + ', '.join(browsers) + ', "stable" is used by '
                     'default.', type='choice', choices=browsers,
                     default='stable')
   parser.add_option('-v', '--verbose', help='Verbose logging.',
                     action='store_true')
   parser.add_option('-z', '--compress', help='Compress the resulting trace '
                     'with gzip. ', action='store_true')
   options, args = parser.parse_args()
+  if options.trace_cc:
+    parser.parse_error("""--trace-cc is deprecated.
+
+For basic jank busting uses, use  --trace-frame-viewer
+For detailed study of ubercompositor, pass --trace-ubercompositor.
+
+When in doubt, just try out --trace-frame-viewer.
+""")
 
   if options.verbose:
     logging.getLogger().setLevel(logging.DEBUG)
 
   adb = android_commands.AndroidCommands()
   if options.systrace_categories in ['list', 'help']:
     _PrintMessage('\n'.join(SystraceController.GetCategories(adb)))
     return 0
 
   if not options.time and not options.continuous:
@@ skipping 27 matching lines @@
                                 options.time if not options.continuous else 0,
                                 options.output,
                                 options.compress,
                                 options.html)
   if options.view:
     webbrowser.open(result)
 
 
 if __name__ == '__main__':
   sys.exit(main())