Final wiring of the distribution strings...

chrome/installer/util/google_chrome_distribution_unittest.cc

Index: chrome/installer/util/google_chrome_distribution_unittest.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution_unittest.cc	(revision 12500)
+++ chrome/installer/util/google_chrome_distribution_unittest.cc	(working copy)
@@ -271,20 +271,26 @@
   EXPECT_TRUE(file_util::Delete(prefs, false));
 }
 
+// The distribution strings should not be empty on chrome or chromium distros.
 TEST(BrowserDistribution, StringsTest) {
   BrowserDistribution *dist = BrowserDistribution::GetDistribution();
   ASSERT_TRUE(dist != NULL);
   std::wstring name = dist->GetApplicationName();
+  EXPECT_FALSE(name.empty());
   std::wstring desc = dist->GetAppDescription();
+  EXPECT_FALSE(desc.empty());
   std::wstring alt_name = dist->GetAlternateApplicationName();
-  // TODO(cpu) finish the test when the translated strings arrive.
+  EXPECT_FALSE(alt_name.empty());
 }
 
+// The shortcut strings obtained by the shell utility functions should not
+// be empty or be the same.
 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);
+  EXPECT_FALSE(normal_name.empty());
+  EXPECT_FALSE(alternate_name.empty());
 }
-