Merge r13043....

chrome/installer/util/google_chrome_distribution_unittest.cc

 // Copyright (c) 2006-2008 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 GoogleChromeDistribution class.
 
 #include <windows.h>
 
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
@@ skipping 210 matching lines @@
 
   std::wstring uninstall_metrics_string;
   GoogleChromeDistribution* dist = static_cast<GoogleChromeDistribution*>(
       BrowserDistribution::GetDistribution());
   EXPECT_TRUE(
       dist->ExtractUninstallMetrics(*static_cast<DictionaryValue*>(root.get()),
                                     &uninstall_metrics_string));
   EXPECT_EQ(expected_url_string, uninstall_metrics_string);
 }
 
+#else
+// The distribution strings should not be empty. The unit tests are not linking
+// with the chrome resources so we cannot test official build.
+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();
+  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());
+}
 #endif
 
 TEST(MasterPreferences, ParseDistroParams) {
   std::wstring prefs;
   ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs));
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
     "     \"skip_first_run_ui\": true,\n"
     "     \"show_welcome_page\": true,\n"
@@ skipping 23 matching lines @@
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_CREATE_ALL_SHORTCUTS);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_DO_NOT_LAUNCH_CHROME);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_MAKE_CHROME_DEFAULT);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_SYSTEM_LEVEL);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_VERBOSE_LOGGING);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_REQUIRE_EULA);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_ALT_SHORTCUT_TXT);
   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();
-  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());
-}