trunk/src/content/browser/tracing/tracing_controller_browsertest.cc - Issue 89753004: Revert 237280 "Remove TraceController"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/content/browser/tracing/tracing_controller_browsertest.cc

Issue 89753004: Revert 237280 "Remove TraceController" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/content/browser/tracing/trace_subscriber_stdio_unittest.cc ('k') | trunk/src/content/browser/tracing/tracing_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/content/browser/tracing/tracing_controller_browsertest.cc

===================================================================

--- trunk/src/content/browser/tracing/tracing_controller_browsertest.cc (revision 237451)

+++ trunk/src/content/browser/tracing/tracing_controller_browsertest.cc (working copy)

@@ -122,7 +122,8 @@

base::Unretained(this),

run_loop.QuitClosure());

bool result = controller->EnableRecording(

- "", TracingController::DEFAULT_OPTIONS, callback);

+ base::debug::CategoryFilter(""), TracingController::Options(),

+ callback);

ASSERT_TRUE(result);

run_loop.Run();

EXPECT_EQ(enable_recording_done_callback_count(), 1);

@@ -154,7 +155,8 @@

base::Unretained(this),

run_loop.QuitClosure());

bool result = controller->EnableMonitoring(

- "", TracingController::ENABLE_SAMPLING, callback);

+ base::debug::CategoryFilter(""), TracingController::ENABLE_SAMPLING,

+ callback);

ASSERT_TRUE(result);

run_loop.Run();

EXPECT_EQ(enable_monitoring_done_callback_count(), 1);

@@ -167,8 +169,7 @@

CaptureMonitoringSnapshotDoneCallbackTest,

base::Unretained(this),

run_loop.QuitClosure());

- ASSERT_TRUE(controller->CaptureMonitoringSnapshot(result_file_path,

- callback));

+ controller->CaptureMonitoringSnapshot(result_file_path, callback);

run_loop.Run();

EXPECT_EQ(capture_monitoring_snapshot_done_callback_count(), 1);

}

@@ -207,7 +208,7 @@

base::Bind(&TracingControllerTest::GetCategoriesDoneCallbackTest,

base::Unretained(this),

run_loop.QuitClosure());

- ASSERT_TRUE(controller->GetCategories(callback));

+ controller->GetCategories(callback);

run_loop.Run();

EXPECT_EQ(get_categories_done_callback_count(), 1);

}

@@ -230,7 +231,7 @@

TracingController* controller = TracingController::GetInstance();

EXPECT_TRUE(controller->EnableRecording(

- "", TracingController::DEFAULT_OPTIONS,

+ base::debug::CategoryFilter(""), TracingController::Options(),

TracingController::EnableRecordingDoneCallback()));

EXPECT_TRUE(controller->DisableRecording(

base::FilePath(), TracingController::TracingFileResultCallback()));

@@ -257,7 +258,7 @@

TracingController* controller = TracingController::GetInstance();

EXPECT_TRUE(controller->EnableMonitoring(

- "", TracingController::ENABLE_SAMPLING,

+ base::debug::CategoryFilter(""), TracingController::ENABLE_SAMPLING,

TracingController::EnableMonitoringDoneCallback()));

controller->CaptureMonitoringSnapshot(

base::FilePath(), TracingController::TracingFileResultCallback());