[Android] Fix bugs for menu item display in CCT

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 android.app.Activity;
 import android.app.Application;
@@ skipping 370 matching lines @@
         assertNotNull(menu.findItem(R.id.reload_menu_id));
         assertNotNull(menu.findItem(R.id.open_in_browser_id));
         assertFalse(menu.findItem(R.id.share_row_menu_id).isVisible());
         assertFalse(menu.findItem(R.id.share_row_menu_id).isEnabled());
         assertNotNull(menu.findItem(R.id.find_in_page_id));
         assertNotNull(menu.findItem(R.id.add_to_homescreen_id));
         assertNotNull(menu.findItem(R.id.request_desktop_site_id));
     }
 
     /**
+     * Test the entries in app menu for media viewer.
+     */
+    @SmallTest
+    @RetryOnFailure
+    public void testAppMenuForMediaViewer() throws InterruptedException {
+        Intent intent = createMinimalCustomTabIntent();
+        intent.putExtra(CustomTabIntentDataProvider.EXTRA_IS_MEDIA_VIEWER, true);
+        IntentHandler.addTrustedIntentExtras(intent);
+        startCustomTabActivityWithIntent(intent);
+
+        openAppMenuAndAssertMenuShown();
+        Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();
+        final int expectedMenuSize = 0;
+        final int actualMenuSize = getActualMenuSize(menu);
+
+        assertNotNull("App menu is not initialized: ", menu);
+        assertEquals(expectedMenuSize, actualMenuSize);
+        assertFalse(menu.findItem(R.id.find_in_page_id).isVisible());
+        assertFalse(menu.findItem(R.id.add_to_homescreen_id).isVisible());
+        assertFalse(menu.findItem(R.id.request_desktop_site_id).isVisible());
+        assertFalse(menu.findItem(R.id.open_in_browser_id).isVisible());
+    }
+
+    /**
      * Tests if the default share item can be shown in the app menu.
      */
     @SmallTest
     @RetryOnFailure
     public void testShareMenuItem() throws InterruptedException {
         Intent intent = createMinimalCustomTabIntent();
         intent.putExtra(CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM, true);
         startCustomTabActivityWithIntent(intent);
 
         openAppMenuAndAssertMenuShown();
@@ skipping 1457 matching lines @@
                 if (jsonText.equalsIgnoreCase("null")) jsonText = "";
                 value = jsonText;
             } catch (InterruptedException | TimeoutException e) {
                 e.printStackTrace();
                 return false;
             }
             return TextUtils.equals(mExpected, value);
         }
     }
 }