chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java - Issue 2204983002: [TTS] Update instrumentation tests to work with Tap Suppression.

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: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

Issue 2204983002: [TTS] Update instrumentation tests to work with Tap Suppression. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed a reference to the obsolete testing flag in ContextualSearchFieldTrial. Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

index 5b1424ebe2ca3e7cb1c7c00b86be1b40e27941b2..85e47a7ac85de4509b062c13e8f3c12657663bed 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

@@ -64,7 +64,7 @@ public class ContextualSearchFieldTrial {

private static final String ENABLE_QUICK_ANSWERS = "enable_quick_answers";

// Tap triggering suppression.

- private static final String SUPPRESSION_TAPS = "suppression_taps";

+ static final String SUPPRESSION_TAPS = "suppression_taps";

// Enables collection of recent scroll seen/unseen histograms.

// TODO(donnd): remove all supporting code once short-lived data collection is done.

private static final String ENABLE_RECENT_SCROLL_COLLECTION = "enable_recent_scroll_collection";

@@ -121,15 +121,6 @@ public class ContextualSearchFieldTrial {

return false;

}

- // This is used for instrumentation tests (i.e. it is not a user-flippable flag). We cannot

- // use Variations params because in the test harness, the initialization comes before any

- // native methods are available. And the ContextualSearchManager is initialized very early

- // in the Chrome initialization.

- if (CommandLine.getInstance().hasSwitch(

- ChromeSwitches.ENABLE_CONTEXTUAL_SEARCH_FOR_TESTING)) {

- return true;

- }

// Allow this user-flippable flag to disable the feature.

if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_CONTEXTUAL_SEARCH)) {

return false;