components/printing/renderer/print_web_view_helper.h - Issue 1075783002: Enable components_browsertests on Android

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: components/printing/renderer/print_web_view_helper.h

Issue 1075783002: Enable components_browsertests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix GN build and add java dependency to components/test/DEPS Created 5 years, 8 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

« no previous file with comments | « components/dom_distiller/content/test/dom_distiller_js_browsertest.cc ('k') | components/printing/test/print_web_view_helper_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/printing/renderer/print_web_view_helper.h

diff --git a/components/printing/renderer/print_web_view_helper.h b/components/printing/renderer/print_web_view_helper.h

index d040dbc82096713311eb9169dfb43563dd02f02a..562b1e0d675682e4fa15711e68e7b78e598e17c0 100644

--- a/components/printing/renderer/print_web_view_helper.h

+++ b/components/printing/renderer/print_web_view_helper.h

@@ -26,6 +26,17 @@ struct PrintMsg_PrintPage_Params;

struct PrintMsg_PrintPages_Params;

struct PrintHostMsg_SetOptionsFromDocument_Params;

+// RenderVIewTest-based tests crash on Android

+// http://crbug.com/187500

+#if defined(OS_ANDROID)

+#define MAYBE_PrintWebViewHelperTest DISABLED_PrintWebViewHelperTest

+#define MAYBE_PrintWebViewHelperPreviewTest \

+ DISABLED_PrintWebViewHelperPreviewTest

+#else

+#define MAYBE_PrintWebViewHelperTest PrintWebViewHelperTest

+#define MAYBE_PrintWebViewHelperPreviewTest PrintWebViewHelperPreviewTest

+#endif // defined(OS_ANDROID)

namespace base {

class DictionaryValue;

}

@@ -115,16 +126,16 @@ class PrintWebViewHelper

private:

friend class PrintWebViewHelperTestBase;

- FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperPreviewTest,

+ FRIEND_TEST_ALL_PREFIXES(MAYBE_PrintWebViewHelperPreviewTest,

BlockScriptInitiatedPrinting);

- FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, OnPrintPages);

- FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest,

+ FRIEND_TEST_ALL_PREFIXES(MAYBE_PrintWebViewHelperTest, OnPrintPages);

+ FRIEND_TEST_ALL_PREFIXES(MAYBE_PrintWebViewHelperTest,

BlockScriptInitiatedPrinting);

- FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest,

+ FRIEND_TEST_ALL_PREFIXES(MAYBE_PrintWebViewHelperTest,

BlockScriptInitiatedPrintingFromPopup);

#if defined(OS_WIN) || defined(OS_MACOSX)

- FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, PrintLayoutTest);

- FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, PrintWithIframe);

+ FRIEND_TEST_ALL_PREFIXES(MAYBE_PrintWebViewHelperTest, PrintLayoutTest);

+ FRIEND_TEST_ALL_PREFIXES(MAYBE_PrintWebViewHelperTest, PrintWithIframe);

#endif // defined(OS_WIN) || defined(OS_MACOSX)

enum PrintingResult {