Merge 3029: Avoid uloc_setKeywordValue if the locale contains "@"

third_party/WebKit/Source/platform/LayoutLocaleTest.cpp

 // Copyright 2016 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 "platform/LayoutLocale.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
@@ skipping 117 matching lines @@
       {"ja@lb=loose", "ja", LineBreakIteratorMode::Loose},
   };
   for (const auto& test : tests) {
     RefPtr<LayoutLocale> locale = LayoutLocale::createForTesting(test.locale);
     EXPECT_EQ(test.expected, locale->localeWithBreakKeyword(test.mode))
         << String::format("'%s' with line-break %d should be '%s'", test.locale,
                           static_cast<int>(test.mode), test.expected);
   }
 }
 
+TEST(LayoutLocaleTest, ExistingKeywordName) {
+  const char* tests[] = {
+      "en@x=", "en@lb=xyz", "en@ =",
+  };
+  for (const auto& test : tests) {
+    RefPtr<LayoutLocale> locale = LayoutLocale::createForTesting(test);
+    EXPECT_EQ(test,
+              locale->localeWithBreakKeyword(LineBreakIteratorMode::Normal));
+  }
+}
+
 }  // namespace blink