chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java - Issue 1505913003: Add update menu item and app menu icon badge

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/customtabs/CustomTabActivityTest.java

Issue 1505913003: Add update menu item and app menu icon badge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix a couple of bugs Created 5 years 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

« chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelperTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

index b68e047383b948a5b8625724abc1fd39e35c8310..04c5b58fc3c7bc723165193c84e84451cb6774d4 100644

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

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

@@ -250,7 +250,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {

openAppMenuAndAssertMenuShown();

final int expectedMenuSize = numMenuEntries + NUM_CHROME_MENU_ITEMS;

- Menu menu = getActivity().getAppMenuHandler().getAppMenuForTest().getMenuForTest();

+ Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();

assertNotNull("App menu is not initialized: ", menu);

assertEquals(expectedMenuSize, menu.size());

assertNotNull(menu.findItem(R.id.forward_menu_id));

@@ -272,7 +272,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {

openAppMenuAndAssertMenuShown();

int expectedMenuSize = MAX_MENU_CUSTOM_ITEMS + NUM_CHROME_MENU_ITEMS;

- Menu menu = getActivity().getAppMenuHandler().getAppMenuForTest().getMenuForTest();

+ Menu menu = getActivity().getAppMenuHandler().getAppMenu().getMenu();

assertNotNull("App menu is not initialized: ", menu);

assertEquals(expectedMenuSize, menu.size());

}