Wire the alternate desktop shortcut text

- second set of changes, one small one to come
- adds a parameter on the desktop shortcut creator function that indicate the text to use
- plumbs the master preference and the command line parameter

BUG=1522969


Review URL: http://codereview.chromium.org/42586

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12499 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 0 deletions

diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc
index de437f4..c2064c3 100644
--- a/chrome/installer/util/google_chrome_distribution_unittest.cc
+++ b/chrome/installer/util/google_chrome_distribution_unittest.cc
@@ -14,6 +14,7 @@
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
 #include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/work_item_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -275,5 +276,15 @@ TEST(BrowserDistribution, StringsTest) {
   ASSERT_TRUE(dist != NULL);
   std::wstring name = dist->GetApplicationName();
   std::wstring desc = dist->GetAppDescription();
+  std::wstring alt_name = dist->GetAlternateApplicationName();
   // TODO(cpu) finish the test when the translated strings arrive.
 }
+
+TEST(BrowserDistribution, AlternateAndNormalShortcutName) {
+  std::wstring normal_name;
+  std::wstring alternate_name;
+  EXPECT_TRUE(ShellUtil::GetChromeShortcutName(&normal_name, false));
+  EXPECT_TRUE(ShellUtil::GetChromeShortcutName(&alternate_name, true));
+  EXPECT_NE(normal_name, alternate_name);
+}
+