Linux: The App Launcher now appears on the "Internet" menu, not "Other".

chrome/browser/shell_integration_linux_unittest.cc

 // Copyright 2013 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_linux.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <map>
 
@@ skipping 428 matching lines @@
         " while testing " << test_cases[i].url;
   }
 }
 
 TEST(ShellIntegrationTest, GetDesktopFileContents) {
   const base::FilePath kChromeExePath("/opt/google/chrome/google-chrome");
   const struct {
     const char* url;
     const char* title;
     const char* icon_name;
+    const char* categories;
     bool nodisplay;
     const char* expected_output;
   } test_cases[] = {
     // Real-world case.
     { "http://gmail.com",
       "GMail",
       "chrome-http__gmail.com",
+      "",
       false,
 
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
       "Icon=chrome-http__gmail.com\n"
       "StartupWMClass=gmail.com\n"
     },
 
     // Make sure that empty icons are replaced by the chrome icon.
     { "http://gmail.com",
       "GMail",
       "",
+      "",
       false,
 
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
 #if defined(GOOGLE_CHROME_BUILD)
       "Icon=google-chrome\n"
 #else
       "Icon=chromium-browser\n"
 #endif
       "StartupWMClass=gmail.com\n"
     },
 
-    // Test adding NoDisplay=true.
+    // Test adding categories and NoDisplay=true.
     { "http://gmail.com",
       "GMail",
       "chrome-http__gmail.com",
+      "Graphics;Education;",
       true,
 
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\n"
       "Name=GMail\n"
       "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n"
       "Icon=chrome-http__gmail.com\n"
+      "Categories=Graphics;Education;\n"
       "NoDisplay=true\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",
+      "",
       false,
 
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\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"
       "Icon=chrome-http__evil.com_evil\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",
+      "",
       false,
 
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\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"
       "Icon=chrome-http__evil.com_evil\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",
+      "",
       false,
 
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\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"
       "Icon=chrome-http__evil.com_evil\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,
         ShellIntegrationLinux::GetDesktopFileContents(
             kChromeExePath,
             web_app::GenerateApplicationNameFromURL(GURL(test_cases[i].url)),
             GURL(test_cases[i].url),
             std::string(),
             base::ASCIIToUTF16(test_cases[i].title),
             test_cases[i].icon_name,
             base::FilePath(),
+            test_cases[i].categories,
             test_cases[i].nodisplay));
   }
 }
 
 TEST(ShellIntegrationTest, GetDesktopFileContentsAppList) {
   const base::FilePath kChromeExePath("/opt/google/chrome/google-chrome");
   CommandLine command_line(kChromeExePath);
   command_line.AppendSwitch("--show-app-list");
   EXPECT_EQ(
       "#!/usr/bin/env xdg-open\n"
       "[Desktop Entry]\n"
       "Version=1.0\n"
       "Terminal=false\n"
       "Type=Application\n"
       "Name=Chrome App Launcher\n"
       "Exec=/opt/google/chrome/google-chrome --show-app-list\n"
       "Icon=chrome_app_list\n"
+      "Categories=Network;WebBrowser;\n"
       "StartupWMClass=chrome-app-list\n",
       ShellIntegrationLinux::GetDesktopFileContentsForCommand(
           command_line,
           "chrome-app-list",
           GURL(),
           base::ASCIIToUTF16("Chrome App Launcher"),
           "chrome_app_list",
+          "Network;WebBrowser;",
           false));
 }
 
 TEST(ShellIntegrationTest, GetDirectoryFileContents) {
   const struct {
     const char* title;
     const char* icon_name;
     const char* expected_output;
   } test_cases[] = {
     // Real-world case.
@@ skipping 25 matching lines @@
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); i++) {
     SCOPED_TRACE(i);
     EXPECT_EQ(
         test_cases[i].expected_output,
         ShellIntegrationLinux::GetDirectoryFileContents(
             base::ASCIIToUTF16(test_cases[i].title),
             test_cases[i].icon_name));
   }
 }