Add the calculated WMClass to generated .desktop files.

chrome/browser/shell_integration_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <map>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/browser_distribution.h"
 #elif defined(OS_LINUX)
 #include "base/environment.h"
@@ skipping 163 matching lines @@
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Encoding=UTF-8\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
       "Terminal=false\n"
       "Icon=chrome-http__gmail.com\n"
       "Type=Application\n"
       "Categories=Application;Network;WebBrowser;\n"
+      "StartupWMClass=gmail.com\n"
     },
 
     // Make sure we don't insert duplicate shebangs.
     { "http://gmail.com",
       "GMail",
       "chrome-http__gmail.com",
 
       "#!/some/shebang\n"
       "Name=Google Chrome\n"
       "Exec=/opt/google/chrome/google-chrome %U\n",
 
       "#!/usr/bin/env xdg-open\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
+      "StartupWMClass=gmail.com\n"
     },
 
     // Make sure i18n-ed comments are removed.
     { "http://gmail.com",
       "GMail",
       "chrome-http__gmail.com",
 
       "Name=Google Chrome\n"
       "Exec=/opt/google/chrome/google-chrome %U\n"
       "Comment[pl]=Jakis komentarz.\n",
 
       "#!/usr/bin/env xdg-open\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
+      "StartupWMClass=gmail.com\n"
     },
 
     // Make sure that empty icons are replaced by the chrome icon.
     { "http://gmail.com",
       "GMail",
       "",
 
       "Name=Google Chrome\n"
       "Exec=/opt/google/chrome/google-chrome %U\n"
       "Comment[pl]=Jakis komentarz.\n"
       "Icon=/opt/google/chrome/product_logo_48.png\n",
 
       "#!/usr/bin/env xdg-open\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
       "Icon=/opt/google/chrome/product_logo_48.png\n"
+      "StartupWMClass=gmail.com\n"
     },
 
     // Now we're starting to be more evil...
     { "http://evil.com/evil --join-the-b0tnet",
       "Ownz0red\nExec=rm -rf /",
       "chrome-http__evil.com_evil",
 
       "Name=Google Chrome\n"
       "Exec=/opt/google/chrome/google-chrome %U\n",
 
       "#!/usr/bin/env xdg-open\n"
       "Name=http://evil.com/evil%20--join-the-b0tnet\n"
       "Exec=/opt/google/chrome/google-chrome "
       "--app=http://evil.com/evil%20--join-the-b0tnet\n"
+      "StartupWMClass=evil.com__evil%20--join-the-b0tnet\n"
     },
     { "http://evil.com/evil; rm -rf /; \"; rm -rf $HOME >ownz0red",
       "Innocent Title",
       "chrome-http__evil.com_evil",
 
       "Name=Google Chrome\n"
       "Exec=/opt/google/chrome/google-chrome %U\n",
 
       "#!/usr/bin/env xdg-open\n"
       "Name=Innocent Title\n"
       "Exec=/opt/google/chrome/google-chrome "
       "\"--app=http://evil.com/evil;%20rm%20-rf%20/;%20%22;%20rm%20"
       // Note: $ is escaped as \$ within an arg to Exec, and then
       // the \ is escaped as \\ as all strings in a Desktop file should
       // be; finally, \\ becomes \\\\ when represented in a C++ string!
       "-rf%20\\\\$HOME%20%3Eownz0red\"\n"
+      "StartupWMClass=evil.com__evil;%20rm%20-rf%20_;%20%22;%20"
+      "rm%20-rf%20$HOME%20%3Eownz0red\n"
     },
     { "http://evil.com/evil | cat `echo ownz0red` >/dev/null",
       "Innocent Title",
       "chrome-http__evil.com_evil",
 
       "Name=Google Chrome\n"
       "Exec=/opt/google/chrome/google-chrome %U\n",
 
       "#!/usr/bin/env xdg-open\n"
       "Name=Innocent Title\n"
       "Exec=/opt/google/chrome/google-chrome "
       "--app=http://evil.com/evil%20%7C%20cat%20%60echo%20ownz0red"
       "%60%20%3E/dev/null\n"
+      "StartupWMClass=evil.com__evil%20%7C%20cat%20%60echo%20ownz0red"
+      "%60%20%3E_dev_null\n"
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); i++) {
     SCOPED_TRACE(i);
-    EXPECT_EQ(test_cases[i].expected_output,
-              ShellIntegration::GetDesktopFileContents(
-                  test_cases[i].template_contents,
-                  GURL(test_cases[i].url),
-                  "",
-                  ASCIIToUTF16(test_cases[i].title),
-                  test_cases[i].icon_name));
+    EXPECT_EQ(
+        test_cases[i].expected_output,
+        ShellIntegration::GetDesktopFileContents(
+            test_cases[i].template_contents,
+            web_app::GenerateApplicationNameFromURL(GURL(test_cases[i].url)),
+            GURL(test_cases[i].url),
+            "",
+            ASCIIToUTF16(test_cases[i].title),
+            test_cases[i].icon_name));
   }
 }
 #elif defined(OS_WIN)
 TEST(ShellIntegrationTest, GetChromiumAppIdTest) {
   // Empty profile path should get chrome::kBrowserAppID
   FilePath empty_path;
   EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(),
             ShellIntegration::GetChromiumAppId(empty_path));
 
   // Default profile path should get chrome::kBrowserAppID
   FilePath default_user_data_dir;
   chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
   FilePath default_profile_path =
       default_user_data_dir.AppendASCII(chrome::kNotSignedInProfile);
   EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId(),
             ShellIntegration::GetChromiumAppId(default_profile_path));
 
   // Non-default profile path should get chrome::kBrowserAppID joined with
   // profile info.
   FilePath profile_path(FILE_PATH_LITERAL("root"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("udd"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test"));
   EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() +
             L".udd.UserDataTest",
             ShellIntegration::GetChromiumAppId(profile_path));
 }
 #endif