Fix hyphen-locale.html and hyphenate-limit-lines.html.

webkit/support/test_webkit_platform_support.cc

 // Copyright (c) 2012 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 "webkit/support/test_webkit_platform_support.h"
 
 #include "base/file_util.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 484 matching lines @@
 TestWebKitPlatformSupport::createRTCPeerConnectionHandler(
     WebKit::WebRTCPeerConnectionHandlerClient* client) {
   if (shadow_platform_delegate_)
     return shadow_platform_delegate_->createRTCPeerConnectionHandler(client);
 
   return webkit_glue::WebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
       client);
 }
 
 bool TestWebKitPlatformSupport::canHyphenate(const WebKit::WebString& locale) {
-  return locale.isEmpty() || locale.equals("en_US");
+  return locale.isEmpty()  || locale.equals("en") || locale.equals("en_US")  ||
+      locale.equals("en_GB");
 }
 
 size_t TestWebKitPlatformSupport::computeLastHyphenLocation(
     const char16* characters,
     size_t length,
     size_t before_index,
     const WebKit::WebString& locale) {
-  DCHECK(locale.isEmpty() || locale.equals("en_US"));
+  DCHECK(locale.isEmpty()  || locale.equals("en") || locale.equals("en_US")  ||
+         locale.equals("en_GB"));
   if (!hyphen_dictionary_) {
     // Initialize the hyphen library with a sample dictionary. To avoid test
     // flakiness, this code synchronously loads the dictionary.
     FilePath path;
     if (!PathService::Get(base::DIR_SOURCE_ROOT, &path))
       return 0;
     path = path.AppendASCII("third_party");
     path = path.AppendASCII("hyphen");
     path = path.AppendASCII("hyph_en_US.dic");
     std::string dictionary;
     if (!file_util::ReadFileToString(path, &dictionary))
       return 0;
     hyphen_dictionary_ = hnj_hyphen_load(
         reinterpret_cast<const unsigned char*>(dictionary.data()),
         dictionary.length());
     if (!hyphen_dictionary_)
       return 0;
   }
   // Retrieve the positions where we can insert hyphens. This function assumes
   // the input word is an English word so it can use the position returned by
   // the hyphen library without conversion.
   string16 word_utf16(characters, length);
   if (!IsStringASCII(word_utf16))
     return 0;
-  std::string word = UTF16ToASCII(word_utf16);
+  std::string word = StringToLowerASCII(UTF16ToASCII(word_utf16));
   scoped_array<char> hyphens(new char[word.length() + 5]);
   char** rep = NULL;
   int* pos = NULL;
   int* cut = NULL;
   int error = hnj_hyphen_hyphenate2(hyphen_dictionary_,
                                     word.data(),
                                     static_cast<int>(word.length()),
                                     hyphens.get(),
                                     NULL,
                                     &rep,
@@ skipping 19 matching lines @@
   // Retrieve the last position where we can insert a hyphen before the given
   // index.
   if (before_index >= 2) {
     for (size_t index = before_index - 2; index > 0; --index) {
       if (hyphens[index] & 1)
         return index + 1;
     }
   }
   return 0;
 }