Add navigateNewTab, navigateIncognitoTab, and downloadLink.

As part of Feed development, add entry points to allow an XSurface
client to open a page in a new tab, open in an incognito tab, or
download the URL as an offline page.

Bug: 1099057
Change-Id: Id6152147c105993d88aa08cee9f16ea42da45b2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2265497Reviewed-by: Dan H <harringtond@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Jian Li <jianli@chromium.org>
Commit-Queue: Peter Williamson <petewil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782741}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java

@@ -22,6 +22,8 @@ import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
+import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
+import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.suggestions.SuggestionsConfig;
@@ -393,12 +395,24 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
 
     @Override
     public void navigateTab(String url) {
-        openUrl(url, /*inNewTab=*/false);
+        openUrl(url, WindowOpenDisposition.CURRENT_TAB);
     }
 
     @Override
     public void navigateNewTab(String url) {
-        openUrl(url, /*inNewTab=*/true);
+        openUrl(url, WindowOpenDisposition.NEW_FOREGROUND_TAB);
+    }
+
+    @Override
+    public void navigateIncognitoTab(String url) {
+        openUrl(url, WindowOpenDisposition.OFF_THE_RECORD);
+    }
+
+    @Override
+    public void downloadLink(String url) {
+        RequestCoordinatorBridge.getForProfile(Profile.getLastUsedRegularProfile())
+                .savePageLater(url, OfflinePageBridge.SUGGESTED_ARTICLES_NAMESPACE,
+                        true /* user requested*/);
     }
 
     @Override
@@ -502,19 +516,21 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
         }
     }
 
-    private void openUrl(String url, boolean inNewTab) {
+    private void openUrl(String url, int disposition) {
         LoadUrlParams params = new LoadUrlParams(url, PageTransition.AUTO_BOOKMARK);
         params.setReferrer(
                 new Referrer(SuggestionsConfig.getReferrerUrl(ChromeFeatureList.INTEREST_FEED_V2),
                         ReferrerPolicy.ALWAYS));
-        Tab tab =
-                mPageNavigationDelegate.openUrl(inNewTab ? WindowOpenDisposition.NEW_BACKGROUND_TAB
-                                                         : WindowOpenDisposition.CURRENT_TAB,
-                        params);
+        Tab tab = mPageNavigationDelegate.openUrl(disposition, params);
+
+        boolean inNewTab = (disposition == WindowOpenDisposition.NEW_BACKGROUND_TAB
+                || disposition == WindowOpenDisposition.OFF_THE_RECORD);
 
         FeedStreamSurfaceJni.get().reportNavigationStarted(
-                mNativeFeedStreamSurface, FeedStreamSurface.this, url, inNewTab);
-        tab.addObserver(new FeedTabNavigationObserver(inNewTab));
+                mNativeFeedStreamSurface, FeedStreamSurface.this);
+        if (tab != null) {
+            tab.addObserver(new FeedTabNavigationObserver(inNewTab));
+        }
     }
 
     @NativeMethods
@@ -524,8 +540,7 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
         // TODO(jianli): Call this function at the appropriate time.
         void reportSliceViewed(
                 long nativeFeedStreamSurface, FeedStreamSurface caller, String sliceId);
-        void reportNavigationStarted(long nativeFeedStreamSurface, FeedStreamSurface caller,
-                String url, boolean inNewTab);
+        void reportNavigationStarted(long nativeFeedStreamSurface, FeedStreamSurface caller);
         // TODO(jianli): Call this function at the appropriate time.
         void reportPageLoaded(long nativeFeedStreamSurface, FeedStreamSurface caller, String url,
                 boolean inNewTab);

chrome/android/junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurfaceTest.java

@@ -7,7 +7,9 @@ package org.chromium.chrome.browser.feed.v2;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.support.test.filters.SmallTest;
@@ -19,7 +21,9 @@ import com.google.protobuf.ByteString;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
@@ -27,13 +31,17 @@ import org.robolectric.annotation.Config;
 
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.JniMocker;
+import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
+import org.chromium.chrome.browser.tab.MockTab;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.xsurface.FeedActionsHandler;
+import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.feed.proto.FeedUiProto.Slice;
 import org.chromium.components.feed.proto.FeedUiProto.StreamUpdate;
 import org.chromium.components.feed.proto.FeedUiProto.StreamUpdate.SliceUpdate;
 import org.chromium.components.feed.proto.FeedUiProto.XSurfaceSlice;
+import org.chromium.ui.mojom.WindowOpenDisposition;
 
 import java.util.Arrays;
 
@@ -42,6 +50,7 @@ import java.util.Arrays;
 @Config(manifest = Config.NONE)
 public class FeedStreamSurfaceTest {
     private static final String TEST_DATA = "test";
+    private static final String TEST_URL = "https://www.chromium.org";
     private FeedStreamSurface mFeedStreamSurface;
     private Activity mActivity;
 
@@ -51,9 +60,15 @@ public class FeedStreamSurfaceTest {
     private FeedActionsHandler.SnackbarController mSnackbarController;
     @Mock
     private BottomSheetController mBottomSheetController;
+    @Mock
+    private NativePageNavigationDelegate mPageNavigationDelegate;
 
     @Rule
     public JniMocker mocker = new JniMocker();
+    // Enable the Features class, so we can call code which checks to see if features are enabled
+    // without crashing.
+    @Rule
+    public TestRule mFeaturesProcessorRule = new Features.JUnitProcessor();
 
     @Mock
     private FeedStreamSurface.Natives mFeedStreamSurfaceJniMock;
@@ -63,8 +78,8 @@ public class FeedStreamSurfaceTest {
         MockitoAnnotations.initMocks(this);
         mActivity = Robolectric.buildActivity(Activity.class).get();
         mocker.mock(FeedStreamSurfaceJni.TEST_HOOKS, mFeedStreamSurfaceJniMock);
-        mFeedStreamSurface = new FeedStreamSurface(
-                mActivity, false, mSnackbarManager, null, mBottomSheetController);
+        mFeedStreamSurface = new FeedStreamSurface(mActivity, false, mSnackbarManager,
+                mPageNavigationDelegate, mBottomSheetController);
     }
 
     @Test
@@ -358,6 +373,32 @@ public class FeedStreamSurfaceTest {
         assertEquals(headers + 6, contentManager.findContentPositionByKey("i"));
     }
 
+    @Test
+    @SmallTest
+    public void testNavigateTab() {
+        when(mPageNavigationDelegate.openUrl(anyInt(), any())).thenReturn(new MockTab(1, false));
+        mFeedStreamSurface.navigateTab(TEST_URL);
+        verify(mPageNavigationDelegate)
+                .openUrl(ArgumentMatchers.eq(WindowOpenDisposition.CURRENT_TAB), any());
+    }
+
+    @Test
+    @SmallTest
+    public void testNavigateNewTab() {
+        when(mPageNavigationDelegate.openUrl(anyInt(), any())).thenReturn(new MockTab(1, false));
+        mFeedStreamSurface.navigateNewTab(TEST_URL);
+        verify(mPageNavigationDelegate)
+                .openUrl(ArgumentMatchers.eq(WindowOpenDisposition.NEW_FOREGROUND_TAB), any());
+    }
+
+    @Test
+    @SmallTest
+    public void testNavigateIncognitoTab() {
+        when(mPageNavigationDelegate.openUrl(anyInt(), any())).thenReturn(new MockTab(1, false));
+        mFeedStreamSurface.navigateIncognitoTab(TEST_URL);
+        verify(mPageNavigationDelegate)
+                .openUrl(ArgumentMatchers.eq(WindowOpenDisposition.OFF_THE_RECORD), any());
+    }
     @Test
     @SmallTest
     public void testShowSnackbar() {

chrome/browser/android/feed/v2/feed_stream_surface.cc

@@ -175,9 +175,7 @@ void FeedStreamSurface::ReportDownloadAction(JNIEnv* env,
 
 void FeedStreamSurface::ReportNavigationStarted(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jstring>& url,
-    jboolean in_new_tab) {
+    const JavaParamRef<jobject>& obj) {
   feed_stream_api_->ReportNavigationStarted();
 }
 

chrome/browser/android/feed/v2/feed_stream_surface.h

@@ -80,9 +80,7 @@ class FeedStreamSurface : public FeedStreamApi::SurfaceInterface {
   void ReportDownloadAction(JNIEnv* env,
                             const base::android::JavaParamRef<jobject>& obj);
   void ReportNavigationStarted(JNIEnv* env,
-                               const base::android::JavaParamRef<jobject>& obj,
-                               const base::android::JavaParamRef<jstring>& url,
-                               jboolean in_new_tab);
+                               const base::android::JavaParamRef<jobject>& obj);
   void ReportPageLoaded(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         const base::android::JavaParamRef<jstring>& url,

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java

@@ -22,6 +22,16 @@ public interface SurfaceActionsHandler {
      */
     default void navigateNewTab(String url) {}
 
+    /**
+     * Navigate a new incognito tab to a URL.
+     */
+    default void navigateIncognitoTab(String url) {}
+
+    /**
+     * Get an offline page for a URL.
+     */
+    default void downloadLink(String url) {}
+
     /**
      * Open a bottom sheet with the view as contents.
      */