Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: content/browser/tracing/tracing_controller_browsertest.cc

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/files/file_util.h" 5 #include "base/files/file_util.h"
6 #include "base/memory/ref_counted_memory.h" 6 #include "base/memory/ref_counted_memory.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "content/public/browser/tracing_controller.h" 8 #include "content/public/browser/tracing_controller.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 #include "content/public/test/content_browser_test.h" 10 #include "content/public/test/content_browser_test.h"
11 #include "content/public/test/content_browser_test_utils.h" 11 #include "content/public/test/content_browser_test_utils.h"
12 #include "content/shell/browser/shell.h" 12 #include "content/shell/browser/shell.h"
13 13
14 using base::debug::CategoryFilter; 14 using base::trace_event::CategoryFilter;
15 using base::debug::TraceOptions; 15 using base::trace_event::TraceOptions;
16 using base::debug::RECORD_CONTINUOUSLY; 16 using base::trace_event::RECORD_CONTINUOUSLY;
17 using base::debug::RECORD_UNTIL_FULL; 17 using base::trace_event::RECORD_UNTIL_FULL;
18 18
19 namespace content { 19 namespace content {
20 20
21 class TracingControllerTest : public ContentBrowserTest { 21 class TracingControllerTest : public ContentBrowserTest {
22 public: 22 public:
23 TracingControllerTest() {} 23 TracingControllerTest() {}
24 24
25 void SetUp() override { 25 void SetUp() override {
26 get_categories_done_callback_count_ = 0; 26 get_categories_done_callback_count_ = 0;
27 enable_recording_done_callback_count_ = 0; 27 enable_recording_done_callback_count_ = 0;
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 trace_options, 365 trace_options,
366 TracingController::EnableMonitoringDoneCallback())); 366 TracingController::EnableMonitoringDoneCallback()));
367 controller->CaptureMonitoringSnapshot(NULL); 367 controller->CaptureMonitoringSnapshot(NULL);
368 base::RunLoop().RunUntilIdle(); 368 base::RunLoop().RunUntilIdle();
369 EXPECT_TRUE(controller->DisableMonitoring( 369 EXPECT_TRUE(controller->DisableMonitoring(
370 TracingController::DisableMonitoringDoneCallback())); 370 TracingController::DisableMonitoringDoneCallback()));
371 base::RunLoop().RunUntilIdle(); 371 base::RunLoop().RunUntilIdle();
372 } 372 }
373 373
374 } // namespace content 374 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/tracing/trace_message_filter.cc ('k') | content/browser/tracing/tracing_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698