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..9c2654d47397798064ebd96f1d04c34d9bd68d87 100644
--- a/chrome/browser/shell_integration_linux_unittest.cc
+++ b/chrome/browser/shell_integration_linux_unittest.cc
@@ -170,7 +170,14 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_FALSE(result.in_applications_menu_chrome_apps_subdir);
+string16 GetAppListShortcutName() {

[gab, 2013/10/03 17:22:49]

Why define this inline here and below?? Does this even compile?!

[calamity, 2013/10/14 02:24:25]

Whoa, how did that happen. removed.

+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == chrome::VersionInfo::CHANNEL_CANARY)
+    return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
+  return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME);
+}
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
@@ -190,7 +197,14 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_FALSE(result.in_applications_menu_chrome_apps_subdir);
+string16 GetAppListShortcutName() {
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == chrome::VersionInfo::CHANNEL_CANARY)
+    return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
+  return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME);
+}
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
@@ -211,7 +225,14 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_TRUE(result.in_applications_menu);
+    EXPECT_TRUE(result.in_applications_menu_chrome_apps_subdir);
+string16 GetAppListShortcutName() {
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == chrome::VersionInfo::CHANNEL_CANARY)
+    return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
+  return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME);
+}
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
@@ -233,7 +254,7 @@ 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_FALSE(result.in_applications_menu_chrome_apps_subdir);
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_TRUE(result.hidden);
   }
@@ -262,7 +283,7 @@ TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
-    EXPECT_TRUE(result.in_applications_menu);
+    EXPECT_TRUE(result.in_applications_menu_chrome_apps_subdir);
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }