Add a default share button to the menu of Custom Tabs

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.customtabs;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_PHONE;
 
 import android.app.Activity;
@@ skipping 160 matching lines @@
 
         CriteriaHelper.pollForUIThreadCriteria(new Criteria("App menu was not shown") {
             @Override
             public boolean isSatisfied() {
                 return mActivity.getAppMenuHandler().isAppMenuShowing();
             }
         });
     }
 
     /**
+     * @return The number of visible and enabled items in the given menu.
+     */
+    private int getActualMenuSize(Menu menu) {
+        int actualMenuSize = 0;
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            if (item.isVisible() && item.isEnabled()) actualMenuSize++;
+        }
+        return actualMenuSize;
+    }
+
+    /**
      * Test the entries in the context menu shown when long clicking an image.
      */
     @SmallTest
     public void testContextMenuEntriesForImage() throws InterruptedException, TimeoutException {
         startCustomTabActivityWithIntent(createMinimalCustomTabIntent());
 
         final int expectedMenuSize = 9;
         Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActivityTab(), "logo");
         assertEquals(expectedMenuSize, menu.size());
 
@@ skipping 48 matching lines @@
         assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible());
         assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible());
         assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible());
         assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible());
     }
 
     /**
      * Test the entries in the app menu.
      */
     @SmallTest
-    public void testCustomTabAppMenu() throws InterruptedException {
+    public void testAppMenu() throws InterruptedException {
         Intent intent = createMinimalCustomTabIntent();
         int numMenuEntries = 1;
         addMenuEntriesToIntent(intent, numMenuEntries);
         startCustomTabActivityWithIntent(intent);
 
         openAppMenuAndAssertMenuShown();
+        Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();
         final int expectedMenuSize = numMenuEntries + NUM_CHROME_MENU_ITEMS;
-        Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();
+        final int actualMenuSize = getActualMenuSize(menu);
+
         assertNotNull("App menu is not initialized: ", menu);
-        assertEquals(expectedMenuSize, menu.size());
+        assertEquals(expectedMenuSize, actualMenuSize);
         assertNotNull(menu.findItem(R.id.forward_menu_id));
         assertNotNull(menu.findItem(R.id.info_menu_id));
         assertNotNull(menu.findItem(R.id.reload_menu_id));
         assertNotNull(menu.findItem(R.id.find_in_page_id));
         assertNotNull(menu.findItem(R.id.open_in_chrome_id));
+        assertFalse(menu.findItem(R.id.share_menu_id).isVisible());
+        assertFalse(menu.findItem(R.id.share_menu_id).isEnabled());
     }
 
     /**
+     * Tests if the default share item can be shown in the app menu.
+     */
+    @SmallTest
+    public void testShareMenuItem() throws InterruptedException {
+        Intent intent = createMinimalCustomTabIntent();
+        intent.putExtra(CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM, true);
+        startCustomTabActivityWithIntent(intent);
+
+        openAppMenuAndAssertMenuShown();
+        Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();
+        assertTrue(menu.findItem(R.id.share_menu_id).isVisible());
+        assertTrue(menu.findItem(R.id.share_menu_id).isEnabled());
+    }
+
+
+    /**
      * Test that only up to 5 entries are added to the custom menu.
      */
     @SmallTest
-    public void testCustomTabMaxMenuItems() throws InterruptedException {
+    public void testMaxMenuItems() throws InterruptedException {
         Intent intent = createMinimalCustomTabIntent();
         int numMenuEntries = 7;
         addMenuEntriesToIntent(intent, numMenuEntries);
         startCustomTabActivityWithIntent(intent);
 
         openAppMenuAndAssertMenuShown();
-        int expectedMenuSize = MAX_MENU_CUSTOM_ITEMS + NUM_CHROME_MENU_ITEMS;
         Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();
+        final int expectedMenuSize = MAX_MENU_CUSTOM_ITEMS + NUM_CHROME_MENU_ITEMS;
+        final int actualMenuSize = getActualMenuSize(menu);
         assertNotNull("App menu is not initialized: ", menu);
-        assertEquals(expectedMenuSize, menu.size());
+        assertEquals(expectedMenuSize, actualMenuSize);
     }
 
     /**
      * Test whether the custom menu is correctly shown and clicking it sends the right
      * {@link PendingIntent}.
      */
     @SmallTest
     public void testCustomMenuEntry() throws InterruptedException {
         Intent intent = createMinimalCustomTabIntent();
         final PendingIntent pi = addMenuEntriesToIntent(intent, 1);
@@ skipping 485 matching lines @@
         @Override
         public void onSendFinished(PendingIntent pendingIntent, Intent intent, int resultCode,
                 String resultData, Bundle resultExtras) {
             if (pendingIntent.equals(mPi)) {
                 mUri = intent.getDataString();
                 mIsSent.set(true);
             }
         }
     }
 }