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

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

Issue 541763002: tracing: get rid of files in TracingController interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed build following removal of cast opterator in scoped_refptr Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/tracing/tracing_controller_browsertest.cc
diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc
index 85c29088059ea0c0ee4243f63f6adb0cc6bbcb66..2faf0b190443759f2193a71625c374ab465ec74b 100644
--- a/content/browser/tracing/tracing_controller_browsertest.cc
+++ b/content/browser/tracing/tracing_controller_browsertest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/file_util.h"
+#include "base/memory/ref_counted_memory.h"
#include "base/run_loop.h"
#include "content/browser/tracing/tracing_controller_impl.h"
#include "content/public/test/browser_test_utils.h"
@@ -51,8 +52,15 @@ class TracingControllerTest : public ContentBrowserTest {
quit_callback.Run();
}
- void DisableRecordingDoneCallbackTest(base::Closure quit_callback,
- const base::FilePath& file_path) {
+ void DisableRecordingStringDoneCallbackTest(base::Closure quit_callback,
+ base::RefCountedMemory* data) {
+ disable_recording_done_callback_count_++;
+ EXPECT_TRUE(data->size() > 0);
+ quit_callback.Run();
+ }
+
+ void DisableRecordingFileDoneCallbackTest(base::Closure quit_callback,
+ const base::FilePath& file_path) {
disable_recording_done_callback_count_++;
EXPECT_TRUE(PathExists(file_path));
int64 file_size;
@@ -115,7 +123,7 @@ class TracingControllerTest : public ContentBrowserTest {
return last_actual_monitoring_file_path_;
}
- void TestEnableAndDisableRecording(const base::FilePath& result_file_path) {
+ void TestEnableAndDisableRecordingString() {
Navigate(shell());
TracingController* controller = TracingController::GetInstance();
@@ -135,11 +143,48 @@ class TracingControllerTest : public ContentBrowserTest {
{
base::RunLoop run_loop;
- TracingController::TracingFileResultCallback callback =
- base::Bind(&TracingControllerTest::DisableRecordingDoneCallbackTest,
+ base::Callback<void(base::RefCountedMemory*)> callback =
+ base::Bind(&TracingControllerTest
+ ::DisableRecordingStringDoneCallbackTest,
base::Unretained(this),
run_loop.QuitClosure());
- bool result = controller->DisableRecording(result_file_path, callback);
+ bool result = controller->DisableRecording(
+ TracingControllerImpl::CreateStringSink(callback));
+ ASSERT_TRUE(result);
+ run_loop.Run();
+ EXPECT_EQ(disable_recording_done_callback_count(), 1);
+ }
+ }
+
+ void TestEnableAndDisableRecordingFile(
+ const base::FilePath& result_file_path) {
+ Navigate(shell());
+
+ TracingController* controller = TracingController::GetInstance();
+
+ {
+ base::RunLoop run_loop;
+ TracingController::EnableRecordingDoneCallback callback =
+ base::Bind(&TracingControllerTest::EnableRecordingDoneCallbackTest,
+ base::Unretained(this),
+ run_loop.QuitClosure());
+ bool result = controller->EnableRecording(
+ CategoryFilter(), TraceOptions(), callback);
+ ASSERT_TRUE(result);
+ run_loop.Run();
+ EXPECT_EQ(enable_recording_done_callback_count(), 1);
+ }
+
+ {
+ base::RunLoop run_loop;
+ base::Closure callback =
+ base::Bind(&TracingControllerTest
+ ::DisableRecordingFileDoneCallbackTest,
+ base::Unretained(this),
+ run_loop.QuitClosure(),
+ result_file_path);
+ bool result = controller->DisableRecording(
+ TracingControllerImpl::CreateFileSink(result_file_path, callback));
ASSERT_TRUE(result);
run_loop.Run();
EXPECT_EQ(disable_recording_done_callback_count(), 1);
@@ -199,13 +244,14 @@ class TracingControllerTest : public ContentBrowserTest {
{
base::RunLoop run_loop;
- TracingController::TracingFileResultCallback callback =
+ base::Closure callback =
base::Bind(&TracingControllerTest::
CaptureMonitoringSnapshotDoneCallbackTest,
base::Unretained(this),
- run_loop.QuitClosure());
- ASSERT_TRUE(controller->CaptureMonitoringSnapshot(result_file_path,
- callback));
+ run_loop.QuitClosure(),
+ result_file_path);
+ ASSERT_TRUE(controller->CaptureMonitoringSnapshot(
+ TracingControllerImpl::CreateFileSink(result_file_path, callback)));
run_loop.Run();
EXPECT_EQ(capture_monitoring_snapshot_done_callback_count(), 1);
}
@@ -264,14 +310,14 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) {
}
IN_PROC_BROWSER_TEST_F(TracingControllerTest, EnableAndDisableRecording) {
- TestEnableAndDisableRecording(base::FilePath());
+ TestEnableAndDisableRecordingString();
}
IN_PROC_BROWSER_TEST_F(TracingControllerTest,
EnableAndDisableRecordingWithFilePath) {
base::FilePath file_path;
base::CreateTemporaryFile(&file_path);
- TestEnableAndDisableRecording(file_path);
+ TestEnableAndDisableRecordingFile(file_path);
EXPECT_EQ(file_path.value(), last_actual_recording_file_path().value());
}
@@ -284,14 +330,15 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest,
CategoryFilter(),
TraceOptions(),
TracingController::EnableRecordingDoneCallback()));
- EXPECT_TRUE(controller->DisableRecording(
- base::FilePath(), TracingController::TracingFileResultCallback()));
+ EXPECT_TRUE(controller->DisableRecording(NULL));
base::RunLoop().RunUntilIdle();
}
IN_PROC_BROWSER_TEST_F(TracingControllerTest,
EnableCaptureAndDisableMonitoring) {
- TestEnableCaptureAndDisableMonitoring(base::FilePath());
+ base::FilePath file_path;
+ base::CreateTemporaryFile(&file_path);
+ TestEnableCaptureAndDisableMonitoring(file_path);
}
IN_PROC_BROWSER_TEST_F(TracingControllerTest,
@@ -322,8 +369,7 @@ IN_PROC_BROWSER_TEST_F(
CategoryFilter("*"),
trace_options,
TracingController::EnableMonitoringDoneCallback()));
- controller->CaptureMonitoringSnapshot(
- base::FilePath(), TracingController::TracingFileResultCallback());
+ controller->CaptureMonitoringSnapshot(NULL);
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(controller->DisableMonitoring(
TracingController::DisableMonitoringDoneCallback()));

Powered by Google App Engine
This is Rietveld 408576698