| Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| index 59a1b1968b6a782ed60167b553018212f42d3011..bf626060b23cacef007565826403c7370e34bc5b 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| @@ -367,11 +367,14 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| private final String mContextLanguage;
|
| private final String mThumbnailUrl;
|
| private final String mCaption;
|
| + private final String mQuickActionUri;
|
| + private final String mQuickActionCategory;
|
|
|
| public FakeResponseOnMainThread(boolean isNetworkUnavailable, int responseCode,
|
| String searchTerm, String displayText, String alternateTerm, String mid,
|
| boolean doPreventPreload, int startAdjust, int endAdjudst, String contextLanguage,
|
| - String thumbnailUrl, String caption) {
|
| + String thumbnailUrl, String caption, String quickActionUri,
|
| + String quickActionCategory) {
|
| mIsNetworkUnavailable = isNetworkUnavailable;
|
| mResponseCode = responseCode;
|
| mSearchTerm = searchTerm;
|
| @@ -384,13 +387,16 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| mContextLanguage = contextLanguage;
|
| mThumbnailUrl = thumbnailUrl;
|
| mCaption = caption;
|
| + mQuickActionUri = quickActionUri;
|
| + mQuickActionCategory = quickActionCategory;
|
| }
|
|
|
| @Override
|
| public void run() {
|
| mFakeServer.handleSearchTermResolutionResponse(mIsNetworkUnavailable, mResponseCode,
|
| mSearchTerm, mDisplayText, mAlternateTerm, mMid, mDoPreventPreload,
|
| - mStartAdjust, mEndAdjust, mContextLanguage, mThumbnailUrl, mCaption);
|
| + mStartAdjust, mEndAdjust, mContextLanguage, mThumbnailUrl, mCaption,
|
| + mQuickActionUri, mQuickActionCategory);
|
| }
|
| }
|
|
|
| @@ -401,7 +407,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| private void fakeResponse(boolean isNetworkUnavailable, int responseCode,
|
| String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload) {
|
| fakeResponse(isNetworkUnavailable, responseCode, searchTerm, displayText, alternateTerm,
|
| - null, doPreventPreload, 0, 0, "", "", "");
|
| + null, doPreventPreload, 0, 0, "", "", "", "", "");
|
| }
|
|
|
| /**
|
| @@ -411,11 +417,12 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| private void fakeResponse(boolean isNetworkUnavailable, int responseCode, String searchTerm,
|
| String displayText, String alternateTerm, String mid, boolean doPreventPreload,
|
| int startAdjust, int endAdjust, String contextLanguage, String thumbnailUrl,
|
| - String caption) {
|
| + String caption, String quickActionUri, String quickActionCategory) {
|
| if (mFakeServer.getSearchTermRequested() != null) {
|
| getInstrumentation().runOnMainSync(new FakeResponseOnMainThread(isNetworkUnavailable,
|
| responseCode, searchTerm, displayText, alternateTerm, mid, doPreventPreload,
|
| - startAdjust, endAdjust, contextLanguage, thumbnailUrl, caption));
|
| + startAdjust, endAdjust, contextLanguage, thumbnailUrl, caption,
|
| + quickActionUri, quickActionCategory));
|
| }
|
| }
|
|
|
| @@ -2180,7 +2187,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| waitForPanelToPeek();
|
|
|
| fakeResponse(false, 200, "Intelligence", "United States Intelligence", "alternate-term",
|
| - null, false, -14, 0, "", "", "");
|
| + null, false, -14, 0, "", "", "", "", "");
|
| waitForSelectionToBe("United States Intelligence");
|
| }
|
|
|
|
|