Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration_linux_unittest.cc

Index: chrome/browser/shell_integration_linux_unittest.cc
diff --git a/chrome/browser/shell_integration_linux_unittest.cc b/chrome/browser/shell_integration_linux_unittest.cc
index 9bf6ec4e07853705f7e3514f81727ac0d34ee541..c061cb7770ac1880a967a8e55ed800f5709d43a7 100644
--- a/chrome/browser/shell_integration_linux_unittest.cc
+++ b/chrome/browser/shell_integration_linux_unittest.cc
@@ -170,7 +170,9 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_EQ(result.applications_menu_location,
+              ShellIntegration::APP_MENU_LOCATION_NONE);

[gab, 2013/11/21 19:52:24]

nit: I know this feels backwards, but the EXPECT_EQ macro is

EXPECT_EQ(expected, actual);

So please flip them to have the constant as the first argument here and below.

[calamity, 2013/11/24 23:55:15]

Done.

+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
@@ -190,7 +192,9 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_EQ(result.applications_menu_location,
+              ShellIntegration::APP_MENU_LOCATION_NONE);
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
@@ -211,7 +215,9 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_TRUE(result.in_applications_menu);
+    EXPECT_EQ(result.applications_menu_location,
+              ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS);
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
@@ -233,7 +239,8 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
             &env, kProfilePath, kExtensionId);
     // Doesn't count as being in applications menu.
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_EQ(result.applications_menu_location,
+              ShellIntegration::APP_MENU_LOCATION_NONE);
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_TRUE(result.hidden);
   }
@@ -262,7 +269,8 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
-    EXPECT_TRUE(result.in_applications_menu);
+    EXPECT_EQ(result.applications_menu_location,
+              ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS);
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }