Linux: apply a different hyphen patch.

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/files/scoped_temp_dir.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
@@ skipping 531 matching lines @@
     size_t length,
     size_t before_index,
     const WebKit::WebString& locale) {
   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.
     base::FilePath path = webkit_support::GetChromiumRootDirFilePath();
     path = path.Append(FILE_PATH_LITERAL("third_party/hyphen/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());
+    hyphen_dictionary_ = hnj_hyphen_load(path.value().c_str());

[darin (slow to review), 2013/02/15 18:16:40]

Does this work on Windows?  FilePath::value() returns wstring on Windows.  It
looks like hnj_hyphen_load expects a |const char*|.  You should probably use the
FdopenPlatformFile approach here as well to avoid Unicode issues.  Don't try to
pass UTF-8 to fopen on Windows.  It won't always work.

[Paweł Hajdan Jr., 2013/02/19 13:00:12]

Fixed. Thank you for advice about Windows quirks.

     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 = StringToLowerASCII(UTF16ToASCII(word_utf16));
@@ skipping 88 matching lines @@
   // TODO(jamesr): Support TestViewTypeLayoutTest.
   DCHECK_EQ(TestViewTypeUnitTest, type);
   scoped_ptr<WebKit::WebLayerTreeViewImplForTesting> view(
       new WebKit::WebLayerTreeViewImplForTesting);
   if (!view->initialize())
     return NULL;
   return view.release();
 }
 #endif