content/browser/tracing/tracing_controller_browsertest.cc - Issue 439243006: Disable EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback

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: content/browser/tracing/tracing_controller_browsertest.cc

Issue 439243006: Disable EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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:

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 36f0dce85a83a51ae35250970755dae7baa371f7..9327ec7e2ce78fd424073167a2e565bbf6cf4c0d 100644

--- a/content/browser/tracing/tracing_controller_browsertest.cc

+++ b/content/browser/tracing/tracing_controller_browsertest.cc

@@ -292,9 +292,15 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest,

EXPECT_EQ(file_path.value(), last_actual_monitoring_file_path().value());

}

+// See http://crbug.com/392446

+#if defined(OS_ANDROID)

+#define MAYBE_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback DISABLED_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback

Peter Beverloo 2014/08/04 14:27:41 Please wrap these lines to 80 characters: #define

Michael van Ouwerkerk 2014/08/04 14:30:44 Done.

+#else

+#define MAYBE_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback

+#endif

IN_PROC_BROWSER_TEST_F(

TracingControllerTest,

- EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback) {

+ MAYBE_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback) {

Navigate(shell());

TracingController* controller = TracingController::GetInstance();

« no previous file with comments | « no previous file | no next file » | no next file with comments »