chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java - Issue 1304013002: Move functionality for ContentViewCore to ContextualSearchPanel

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/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

Issue 1304013002: Move functionality for ContentViewCore to ContextualSearchPanel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simple-move-cvc-to-panel

Patch Set: Created 5 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

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

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 a9a85710ae2af5e5f416780bdf0538a47902b70c..a79aa67db1f9116ac1cda3ad2759926c14570fea 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

@@ -80,9 +80,11 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro

mManager = getActivity().getContextualSearchManager();

if (mManager != null) {

- mFakeServer = new ContextualSearchFakeServer(mManager);

- mManager.setNetworkCommunicator(mFakeServer);

mPanelDelegate = mManager.getContextualSearchPanelDelegate();

+ mFakeServer = new ContextualSearchFakeServer(mManager,

+ mPanelDelegate.getContentController());

+ mManager.setNetworkCommunicator(mFakeServer);

+ mPanelDelegate.setContentController(mFakeServer);

mSelectionController = mManager.getSelectionController();

mPolicy = ContextualSearchPolicy.getInstance(getActivity());

@@ -288,7 +290,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro

private void fakeContentViewDidNavigate(int httpResultCode) {

String url = mFakeServer.getLoadedUrl();

- mFakeServer.handleDidNavigateMainFrame(url, httpResultCode);

+ mManager.handleDidNavigateMainFrame(url, httpResultCode);

}

/**