| Index: content/test/gpu/gpu_tests/memory_test.py
|
| diff --git a/content/test/gpu/gpu_tests/memory_test.py b/content/test/gpu/gpu_tests/memory_test.py
|
| index aab18aff2243bea2ff03819718a9459d12ad7067..c06c72255905a16e906f5378b0c302b1ad800a72 100644
|
| --- a/content/test/gpu/gpu_tests/memory_test.py
|
| +++ b/content/test/gpu/gpu_tests/memory_test.py
|
| @@ -1,12 +1,11 @@
|
| # Copyright (c) 2012 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 gpu_test_base
|
| -import memory_test_expectations
|
| +from gpu_tests import gpu_test_base
|
| +from gpu_tests import memory_test_expectations
|
| import page_sets
|
|
|
| from telemetry.page import page_test
|
| -from telemetry.timeline import counter
|
| from telemetry.timeline import model
|
| from telemetry.timeline import tracing_category_filter
|
| from telemetry.timeline import tracing_options
|
| @@ -90,7 +89,7 @@ class MemoryValidator(gpu_test_base.ValidatorBase):
|
| custom_categories = ['webkit.console', 'blink.console', 'gpu']
|
| category_filter = tracing_category_filter.TracingCategoryFilter()
|
| for c in custom_categories:
|
| - category_filter.AddIncludedCategory(c)
|
| + category_filter.AddIncludedCategory(c)
|
| options = tracing_options.TracingOptions()
|
| options.enable_chrome_trace = True
|
| tab.browser.platform.tracing_controller.Start(options, category_filter, 60)
|
|
|