Fix crash on unicode characters in PWA names in context menu

Bug: 822144
Change-Id: I810ee10d0f428f8893d90281079341101d7d8c04
Reviewed-on: https://chromium-review.googlesource.com/963956
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544949}

chrome/browser/renderer_context_menu/render_view_context_menu.cc

@@ -1135,7 +1135,7 @@ void RenderViewContextMenu::AppendOpenInBookmarkAppLinkItems() {
   menu_model_.AddItem(
       IDC_CONTENT_CONTEXT_OPENLINKBOOKMARKAPP,
       l10n_util::GetStringFUTF16(open_in_app_string_id,
-                                 base::ASCIIToUTF16(pwa->short_name())));
+                                 base::UTF8ToUTF16(pwa->short_name())));
 
   MenuManager* menu_manager = MenuManager::Get(browser_context_);
   gfx::Image icon = menu_manager->GetIconForExtension(pwa->id());

chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc

@@ -176,8 +176,9 @@ class ContextMenuBrowserTest : public InProcessBrowserTest {
     WebApplicationInfo web_app_info;
     web_app_info.app_url = app_url;
     web_app_info.scope = app_url;
-    web_app_info.title = base::UTF8ToUTF16("Test app");
-    web_app_info.description = base::UTF8ToUTF16("Test description");
+    web_app_info.title = base::UTF8ToUTF16("Test app \xF0\x9F\x90\x90");
+    web_app_info.description =
+        base::UTF8ToUTF16("Test description \xF0\x9F\x90\x90");
     web_app_info.open_as_window = open_as_window;
 
     return extensions::browsertest_util::InstallBookmarkApp(