[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py

 # 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 timeit
 import unittest
 
 from telemetry import decorators
 from telemetry.internal.backends.chrome_inspector import tracing_backend
 from telemetry.internal.backends.chrome_inspector.tracing_backend import _DevToolsStreamReader
 from telemetry.testing import fakes
 from telemetry.testing import simple_mock
 from telemetry.testing import tab_test_case
 from telemetry.timeline import model as model_module
 from telemetry.timeline import trace_data
 from telemetry.timeline import tracing_config
 
 
 class TracingBackendTest(tab_test_case.TabTestCase):
 
   # Number of consecutively requested memory dumps.
   _REQUESTED_DUMP_COUNT = 3
 
   @classmethod
   def CustomizeBrowserOptions(cls, options):
-    options.enable_logging = True
+    options.logging_verbosity = options.VERBOSE_LOGGING
     options.AppendExtraBrowserArgs([
         # Memory maps currently cannot be retrieved on sandboxed processes.
         # See crbug.com/461788.
         '--no-sandbox',
 
         # Workaround to disable periodic memory dumps. See crbug.com/513692.
         '--enable-memory-benchmarking'
     ])
 
   def setUp(self):
     super(TracingBackendTest, self).setUp()
     self._tracing_controller = self._browser.platform.tracing_controller
     if not self._tracing_controller.IsChromeTracingSupported():
       self.skipTest('Browser does not support tracing, skipping test.')
     if not self._browser.supports_memory_dumping:
       self.skipTest('Browser does not support memory dumping, skipping test.')
 
   # See https://github.com/catapult-project/catapult/issues/2409.
   @decorators.Disabled('win-reference')
   def testDumpMemorySuccess(self):
     # Check that dumping memory before tracing starts raises an exception.
     self.assertRaises(Exception, self._browser.DumpMemory)
 
     # Start tracing with memory dumps enabled.
     config = tracing_config.TracingConfig()
-    config.chrome_trace_config.tracing_category_filter.AddDisabledByDefault(
+    config.chrome_trace_config.category_filter.AddDisabledByDefault(
         'disabled-by-default-memory-infra')
     config.enable_chrome_trace = True
     self._tracing_controller.StartTracing(config)
 
     # Request several memory dumps in a row and test that they were all
     # successfully created with unique IDs.
     expected_dump_ids = []
     for _ in xrange(self._REQUESTED_DUMP_COUNT):
       dump_id = self._browser.DumpMemory()
       self.assertIsNotNone(dump_id)
@@ skipping 161 matching lines @@
     n1 = 1000
     while True:
       t1 = self._MeasureReadTime(n1)
       if t1 > 0.01:
         break
       n1 *= 5
     t2 = self._MeasureReadTime(n1 * 10)
     # Time is an illusion, CPU time is doubly so, allow great deal of tolerance.
     toleranceFactor = 5
     self.assertLess(t2, t1 * 10 * toleranceFactor)