Abstract suffixing logic away from GetApplicationName

chrome/installer/util/browser_distribution_unittest.cc

Index: chrome/installer/util/browser_distribution_unittest.cc
diff --git a/chrome/installer/util/browser_distribution_unittest.cc b/chrome/installer/util/browser_distribution_unittest.cc
index 391320147faf19247bc6a4b96edd138b6fdf66bb..1040e14eb629ba4e4e8186f76a9d074e26990cb6 100644
--- a/chrome/installer/util/browser_distribution_unittest.cc
+++ b/chrome/installer/util/browser_distribution_unittest.cc
@@ -16,11 +16,14 @@ TEST(BrowserDistributionTest, StringsTest) {
         BrowserDistribution::GetSpecificDistribution(
             BrowserDistribution::kProductTypes[i]);
     ASSERT_TRUE(dist != NULL);
-    std::wstring name = dist->GetApplicationName();
+    string16 name = dist->GetUnsuffixedAppName();
     EXPECT_FALSE(name.empty());
-    std::wstring desc = dist->GetAppDescription();
+    string16 suffixed_name = dist->GetAppName();
+    EXPECT_FALSE(suffixed_name.empty());
+    ASSERT_NE(string16::npos, suffixed_name.find(name));
+    string16 desc = dist->GetAppDescription();
     EXPECT_FALSE(desc.empty());
-    std::wstring alt_name = dist->GetAlternateApplicationName();
+    string16 alt_name = dist->GetAlternateApplicationName();
     EXPECT_FALSE(alt_name.empty());
   }
 }
@@ -28,10 +31,10 @@ TEST(BrowserDistributionTest, StringsTest) {
 // The shortcut strings obtained by the shell utility functions should not
 // be empty or be the same.
 TEST(BrowserDistributionTest, AlternateAndNormalShortcutName) {
-  std::wstring normal_name;
-  std::wstring alternate_name;
-  std::wstring appended_name_one;
-  std::wstring appended_name_two;
+  string16 normal_name;
+  string16 alternate_name;
+  string16 appended_name_one;
+  string16 appended_name_two;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   EXPECT_TRUE(ShellUtil::GetChromeShortcutName(dist, false, L"",
                                                &normal_name));