Revert of Update systrace and profile_chrome's default agent behavior

systrace/profile_chrome/main.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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 logging
 import optparse
 import os
 import sys
@@ skipping 81 matching lines @@
     elif len(devices) >= 2:
       raise RuntimeError('Multiple devices connected, serial number required')
     options.device_serial_number = devices[0]
   device = device_utils.DeviceUtils.HealthyDevices(device_arg=
       options.device_serial_number)[0]
   package_info = util.get_supported_browsers()[options.browser]
 
   options.device = device
   options.package_info = package_info
 
-  # Include Chrome categories by default in profile_chrome.
-  if not options.chrome_categories:
-    options.chrome_categories = chrome_tracing_agent.DEFAULT_CHROME_CATEGORIES
-
   if options.chrome_categories in ['list', 'help']:
     ui.PrintMessage('Collecting record categories list...', eol='')
     record_categories = []
     disabled_by_default_categories = []
     record_categories, disabled_by_default_categories = \
         chrome_tracing_agent.ChromeTracingAgent.GetCategories(
             device, package_info)
 
     ui.PrintMessage('done')
     ui.PrintMessage('Record Categories:')
@@ skipping 33 matching lines @@
       options.trace_time if not options.continuous else 0,
       _PROFILE_CHROME_AGENT_MODULES,
       output=options.output_file,
       compress=options.compress,
       write_json=options.write_json)
   if options.view:
     if sys.platform == 'darwin':
       os.system('/usr/bin/open %s' % os.path.abspath(result))
     else:
       webbrowser.open(result)