The UI language rather than the locale is now used to pick Chrome's language ...

chrome/installer/util/language_selector_unittest.cc

Index: chrome/installer/util/language_selector_unittest.cc
===================================================================
--- chrome/installer/util/language_selector_unittest.cc	(revision 0)
+++ chrome/installer/util/language_selector_unittest.cc	(revision 0)
@@ -0,0 +1,110 @@
+// Copyright (c) 2010 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.
+
+#include <string>
+#include <vector>
+
+#include "chrome/installer/util/language_selector.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+const wchar_t* const kExactMatchCandidates[] = {
+#if defined(GOOGLE_CHROME_BUILD)
+  L"am", L"ar", L"bg", L"bn", L"ca", L"cs", L"da", L"de", L"el", L"en-gb",
+  L"en-us", L"es", L"es-419", L"et", L"fa", L"fi", L"fil", L"fr", L"gu", L"hi",
+  L"hr", L"hu", L"id", L"it", L"iw", L"ja", L"kn", L"ko", L"lt", L"lv", L"ml",
+  L"mr", L"nl", L"no", L"pl", L"pt-br", L"pt-pt", L"ro", L"ru", L"sk", L"sl",
+  L"sr", L"sv", L"sw", L"ta", L"te", L"th", L"tr", L"uk", L"vi", L"zh-cn",
+  L"zh-tw"
+#else  // defined(GOOGLE_CHROME_BUILD)

[robertshield, 2010/11/11 14:42:18]

you don't really need the qualifying comments on the #else here and below (it's
fairly short).

[grt (UTC plus 2), 2010/11/11 16:29:27]

Done.

+  L"en-us"
+#endif  // !defined(GOOGLE_CHROME_BUILD)
+};
+
+const wchar_t* const kAliasMatchCandidates[] = {
+#if defined(GOOGLE_CHROME_BUILD)
+  L"he", L"nb", L"tl", L"zh-chs",  L"zh-cht", L"zh-hans", L"zh-hant", L"zh-hk",
+  L"zh-mk", L"zh-mo"
+#else  // defined(GOOGLE_CHROME_BUILD)
+  // There is only en-us.
+  L"en-us"
+#endif // !defined(GOOGLE_CHROME_BUILD)

[robertshield, 2010/11/11 14:42:18]

You don't really need them on the #endif either given how short and not-nested
it is. If you really want to keep them, then it should be defined, not !defined.

[grt (UTC plus 2), 2010/11/11 15:23:57]

My style for these is to make the comment contain the logic for the preceding
code block.  So the stuff above the #else tells you the logic for the #if,
whereas the stuff above the #endif is the inverse.  This way, if you're looking
at a big hunk of code and the #if or #else is offscreen, you know when the code
will be compiled without scrolling around.

For such small code the comments don't add value, but I like the consistency.

Do these contravene the style enough that I should 1) remove the comments from
this CL when the code block is small, and 2) not do my funny logic documentation
anywhere?

[robertshield, 2010/11/11 16:18:53]

The comments are great for longer blocks, IMO they add noise for short blocks.
This is the same as how comments at the end of a long if/else statement might
make sense, but the following would be frowned upon:

if (foo) {
  DoSomething();
} else {
  DoSomethingElse();
}  // foo  <-- no

I say remove them.

[grt (UTC plus 2), 2010/11/11 16:29:27]

Done.

+};
+
+const wchar_t* const kWildcardMatchCandidates[] = {
+  L"en-AU",
+#if defined(GOOGLE_CHROME_BUILD)
+  L"es-CO", L"pt-AB", L"zh-SG"
+#endif  // defined(GOOGLE_CHROME_BUILD)
+};
+
+}  // namespace
+
+// Test that a language is selected from the system.
+TEST(LanguageSelectorTest, DefaultSelection) {
+  installer_util::LanguageSelector instance;
+  EXPECT_FALSE(instance.matched_candidate().empty());
+}
+
+// Test some hypothetical candidate sets.
+TEST(LanguageSelectorTest, AssortedSelections) {
+  {
+    std::wstring candidates[] = {
+      L"fr-BE", L"fr", L"en"
+    };
+    installer_util::LanguageSelector instance(
+        std::vector<std::wstring>(&candidates[0],
+                                  &candidates[arraysize(candidates)]));
+#if defined(GOOGLE_CHROME_BUILD)
+    EXPECT_EQ(L"fr", instance.matched_candidate());
+#else  // defined(GOOGLE_CHROME_BUILD)
+    EXPECT_EQ(L"en-us", instance.matched_candidate());
+#endif  // !defined(GOOGLE_CHROME_BUILD)
+  }
+  {
+    std::wstring candidates[] = {
+      L"xx-YY"
+    };
+    installer_util::LanguageSelector instance(
+      std::vector<std::wstring>(&candidates[0],
+      &candidates[arraysize(candidates)]));
+    EXPECT_EQ(L"en-us", instance.matched_candidate());
+  }
+}
+
+// A fixture for testing sets of single-candidate selections.
+class LanguageSelectorMatchCandidateTest
+    : public ::testing::TestWithParam<const wchar_t*> {
+};
+
+TEST_P(LanguageSelectorMatchCandidateTest, TestMatchCandidate) {
+  installer_util::LanguageSelector instance(
+    std::vector<std::wstring>(1, std::wstring(GetParam())));
+  EXPECT_EQ(GetParam(), instance.matched_candidate());
+}
+
+// Test that all existing translations can be found by exact match.
+INSTANTIATE_TEST_CASE_P(
+    TestExactMatches,
+    LanguageSelectorMatchCandidateTest,
+    ::testing::ValuesIn(
+        &kExactMatchCandidates[0],
+        &kExactMatchCandidates[arraysize(kExactMatchCandidates)]));
+
+// Test the alias matches.
+INSTANTIATE_TEST_CASE_P(
+    TestAliasMatches,
+    LanguageSelectorMatchCandidateTest,
+    ::testing::ValuesIn(
+        &kAliasMatchCandidates[0],
+        &kAliasMatchCandidates[arraysize(kAliasMatchCandidates)]));
+
+// Test a few wildcard matches.
+INSTANTIATE_TEST_CASE_P(
+    TestWildcardMatches,
+    LanguageSelectorMatchCandidateTest,
+    ::testing::ValuesIn(
+        &kWildcardMatchCandidates[0],
+        &kWildcardMatchCandidates[arraysize(kWildcardMatchCandidates)]));