Abstract suffixing logic away from GetApplicationName

chrome/installer/util/browser_distribution_unittest.cc

 // Copyright (c) 2012 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.
 //
 // Unit tests for BrowserDistribution class.
 
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The distribution strings should not be empty. The unit tests are not linking
 // with the chrome resources so we cannot test official build.
 TEST(BrowserDistributionTest, StringsTest) {
   for (size_t i = 0; i < BrowserDistribution::kNumProductTypes; ++i) {
     BrowserDistribution* dist =
         BrowserDistribution::GetSpecificDistribution(
             BrowserDistribution::kProductTypes[i]);
     ASSERT_TRUE(dist != NULL);
-    std::wstring name = dist->GetApplicationName();
+    string16 name = dist->GetBaseAppName();
     EXPECT_FALSE(name.empty());
-    std::wstring desc = dist->GetAppDescription();
+    string16 desc = dist->GetAppDescription();
     EXPECT_FALSE(desc.empty());
-    std::wstring alt_name = dist->GetAlternateApplicationName();
+    string16 alt_name = dist->GetAlternateApplicationName();
     EXPECT_FALSE(alt_name.empty());
   }
 }
 
 // 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));
   EXPECT_TRUE(ShellUtil::GetChromeShortcutName(dist, true, L"",
                                                &alternate_name));
   EXPECT_TRUE(ShellUtil::GetChromeShortcutName(dist, true, L"Sparky",
                                                &appended_name_one));
   EXPECT_TRUE(ShellUtil::GetChromeShortcutName(dist, true, L"Sparkles",
                                                &appended_name_two));
   EXPECT_NE(normal_name, alternate_name);
   EXPECT_NE(appended_name_one, appended_name_two);
   EXPECT_FALSE(normal_name.empty());
   EXPECT_FALSE(alternate_name.empty());
   EXPECT_FALSE(appended_name_one.empty());
   EXPECT_FALSE(appended_name_two.empty());
 }