diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 00:47:55 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 00:47:55 +0000 |
| commit | 6aa58b8599840160df945afa89e7482d14d1c4d4 (patch) | |
| tree | 7da568401c9497ac63894493ca5dd2e68230e35f /content/browser/tracing/tracing_controller_browsertest.cc | |
| parent | 7b05498220a28e7a351c28e75ce1dc68abc746f3 (diff) | |
| download | chromium_src-6aa58b8599840160df945afa89e7482d14d1c4d4.zip chromium_src-6aa58b8599840160df945afa89e7482d14d1c4d4.tar.gz chromium_src-6aa58b8599840160df945afa89e7482d14d1c4d4.tar.bz2 | |
Revert 237280 "Remove TraceController"
Seems to have broken trace-based telemetry benchmarks on android.
BUG=323749
> Remove TraceController
>
> TraceController is obsoleted by TracingController.
> Changed all remaining clients to use TracingController.
>
> BUG=none
>
> Review URL: https://codereview.chromium.org/67683003
TBR=wangxianzhu@chromium.org
Review URL: https://codereview.chromium.org/89753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tracing/tracing_controller_browsertest.cc')
| -rw-r--r-- | content/browser/tracing/tracing_controller_browsertest.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc index 6d5b381..0affc27 100644 --- a/content/browser/tracing/tracing_controller_browsertest.cc +++ b/content/browser/tracing/tracing_controller_browsertest.cc @@ -122,7 +122,8 @@ class TracingControllerTest : public ContentBrowserTest { 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 @@ class TracingControllerTest : public ContentBrowserTest { 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 @@ class TracingControllerTest : public ContentBrowserTest { 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 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) { 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 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, 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 @@ IN_PROC_BROWSER_TEST_F( 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()); |