chrome/browser/ui/app_list/app_context_menu_unittest.cc - Issue 1885683005: Add module suffix in .mojom files for components/arc

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/browser/ui/app_list/app_context_menu_unittest.cc

Issue 1885683005: Add module suffix in .mojom files for components/arc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase only Created 4 years, 8 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/browser/task_management/providers/arc/arc_process_task.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_list_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_context_menu_unittest.cc

diff --git a/chrome/browser/ui/app_list/app_context_menu_unittest.cc b/chrome/browser/ui/app_list/app_context_menu_unittest.cc

index 9483db16997083eecde6853af76e1550c7f47e7a..a3534997ef0db02e503f9cde8855fd3dcc5912e2 100644

--- a/chrome/browser/ui/app_list/app_context_menu_unittest.cc

+++ b/chrome/browser/ui/app_list/app_context_menu_unittest.cc

@@ -344,7 +344,7 @@ TEST_F(AppContextMenuTest, ArcMenu) {

arc_test.SetUp(profile());

arc_test.bridge_service()->SetReady();

- const arc::AppInfo& app_info = arc_test.fake_apps()[0];

+ const arc::mojom::AppInfo& app_info = arc_test.fake_apps()[0];

const std::string app_id = ArcAppTest::GetAppId(app_info);

controller()->SetAppPinnable(app_id, AppListControllerDelegate::PIN_EDITABLE);

@@ -377,7 +377,8 @@ TEST_F(AppContextMenuTest, ArcMenu) {

EXPECT_TRUE(launch_requests[0]->IsForApp(app_info));

arc_test.app_instance()->RefreshAppList();

- arc_test.app_instance()->SendRefreshAppList(std::vector<arc::AppInfo>());

+ arc_test.app_instance()->SendRefreshAppList(

+ std::vector<arc::mojom::AppInfo>());

item.SetReady(false);

EXPECT_EQ(item.GetContextMenuModel(), menu);

@@ -401,7 +402,7 @@ TEST_F(AppContextMenuTest, ArcMenuStickyItem) {

{

// Verify menu of store

- const arc::AppInfo& store_info = arc_test.fake_apps()[0];

+ const arc::mojom::AppInfo& store_info = arc_test.fake_apps()[0];

const std::string store_id = ArcAppTest::GetAppId(store_info);

controller()->SetAppPinnable(store_id,

AppListControllerDelegate::PIN_EDITABLE);

@@ -422,7 +423,7 @@ TEST_F(AppContextMenuTest, ArcMenuStickyItem) {

{

// Verify normal app menu

- const arc::AppInfo& app_info = arc_test.fake_apps()[1];

+ const arc::mojom::AppInfo& app_info = arc_test.fake_apps()[1];

const std::string app_id = ArcAppTest::GetAppId(app_info);

controller()->SetAppPinnable(app_id,

AppListControllerDelegate::PIN_EDITABLE);