Fix the loading of ca@valencia.pak, which is available in

ui/base/l10n/l10n_util_unittest.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cstdlib>
 #endif
 
@@ skipping 123 matching lines @@
     "en-GB",
     "fr",
     "es-419",
     "es",
     "zh-TW",
     "zh-CN",
     "he",
     "fil",
     "nb",
     "am",
+    "ca",
+    "ca@valencia",
   };
 
 #if defined(OS_WIN)
   static const char kLocaleFileExtension[] = ".dll";
 #elif defined(OS_POSIX)
   static const char kLocaleFileExtension[] = ".pak";
 #endif
   for (size_t i = 0; i < arraysize(filenames); ++i) {
     FilePath filename = new_locale_dir.AppendASCII(
         filenames[i] + kLocaleFileExtension);
@@ skipping 33 matching lines @@
   env->SetVar("LC_MESSAGES", "he");
   env->SetVar("LANG", "nb");
   EXPECT_EQ("fr", l10n_util::GetApplicationLocale(""));
   env->UnSetVar("LANGUAGE");
   EXPECT_EQ("es", l10n_util::GetApplicationLocale(""));
   env->UnSetVar("LC_ALL");
   EXPECT_EQ("he", l10n_util::GetApplicationLocale(""));
   env->UnSetVar("LC_MESSAGES");
   EXPECT_EQ("nb", l10n_util::GetApplicationLocale(""));
   env->UnSetVar("LANG");
+
+  SetDefaultLocaleForTest("ca", env.get());
+  EXPECT_EQ("ca", l10n_util::GetApplicationLocale(""));
+
+  SetDefaultLocaleForTest("ca-ES", env.get());
+  EXPECT_EQ("ca", l10n_util::GetApplicationLocale(""));
+
+  SetDefaultLocaleForTest("ca@valencia", env.get());
+  EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(""));
+
+  SetDefaultLocaleForTest("ca_ES@valencia", env.get());
+  EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(""));
+
+  SetDefaultLocaleForTest("ca_ES.UTF8@valencia", env.get());
+  EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(""));
 #endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
 
   SetDefaultLocaleForTest("en-US", env.get());
   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("xx", env.get());
   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
 
 #if defined(OS_CHROMEOS)
   // ChromeOS honors preferred locale first in GetApplicationLocale(),
@@ skipping 186 matching lines @@
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("Latin"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("German"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("pt--BR"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("sl-macedonia"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x="));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@=y"));
 }