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/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/memory/scoped_handle.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "cc/thread_impl.h"
 #include "media/base/media.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/test/test_server.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAudioDevice.h"
@@ skipping 468 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))
+    base::PlatformFile dict_file = base::CreatePlatformFile(
+        path,
+        base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
+        NULL, NULL);
+    if (dict_file == base::kInvalidPlatformFileValue)
       return 0;
-    hyphen_dictionary_ = hnj_hyphen_load(
-        reinterpret_cast<const unsigned char*>(dictionary.data()),
-        dictionary.length());
+    ScopedStdioHandle dict_handle(base::FdopenPlatformFile(dict_file, "r"));
+    if (!dict_handle.get()) {
+      base::ClosePlatformFile(dict_file);
+      return 0;
+    }
+    hyphen_dictionary_ = hnj_hyphen_load_file(dict_handle.get());
     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 91 matching lines @@
   return view.release();
 }
 
 WebKit::WebLayerTreeView*
     TestWebKitPlatformSupport::createLayerTreeViewForTesting(
         TestViewType type) {
   DCHECK_EQ(TestViewTypeUnitTest, type);
   return createLayerTreeViewForTesting();
 }