Set Browser::app_name_ in a reasonable way for extension apps.

chrome/browser/shell_integration_win.cc

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index ad1f653f35328a585dbc350bef354fa09739855c..927aaaabf7d74616b05d05c39e743a1cecd22025 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -37,7 +37,7 @@
 namespace {
 
 // Helper function for ShellIntegration::GetAppId to generates profile id
-// from profile path. "profile_id"  is composed of sanitized basenames of
+// from profile path. "profile_id" is composed of sanitized basenames of
 // user data dir and profile dir joined by a ".".
 std::wstring GetProfileIdFromPath(const FilePath& profile_path) {
   // Return empty string if profile_path is empty
@@ -228,6 +228,9 @@ bool MigrateChromiumShortcutsTask::GetExpectedAppId(
   if (command_line.HasSwitch(switches::kApp)) {
     app_name = UTF8ToWide(web_app::GenerateApplicationNameFromURL(
         GURL(command_line.GetSwitchValueASCII(switches::kApp))));
+  } else if (command_line.HasSwitch(switches::kAppId)) {
+    app_name = UTF8ToWide(web_app::GenerateApplicationNameFromExtensionId(
+        command_line.GetSwitchValueASCII(switches::kAppId)));
   } else {
     app_name = BrowserDistribution::GetDistribution()->GetBrowserAppId();
   }