Switch from using individual methods for hyphenation to using the WebHyphantor interface

webkit/support/test_webkit_platform_support.h

Index: webkit/support/test_webkit_platform_support.h
diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h
index a087d0ac9264818662ebe0e389f8685dd3381ec5..4afe5ebf056688904a057453ad23a1da786870dc 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/webkit/support/test_webkit_platform_support.h
@@ -11,6 +11,7 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebUnitTestSupport.h"
 #include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
+#include "webkit/mocks/mock_webhyphenator.h"
 #include "webkit/support/simple_database_system.h"
 #include "webkit/support/weburl_loader_mock_factory.h"
 #include "webkit/tools/test_shell/mock_webclipboard_impl.h"
@@ -27,8 +28,6 @@ class WebAudioDevice;
 class WebLayerTreeView;
 }
 
-typedef struct _HyphenDict HyphenDict;
-
 // An implementation of WebKitPlatformSupport for tests.
 class TestWebKitPlatformSupport :
     public WebKit::WebUnitTestSupport,
@@ -45,6 +44,7 @@ class TestWebKitPlatformSupport :
   virtual WebKit::WebCookieJar* cookieJar();
   virtual WebKit::WebBlobRegistry* blobRegistry();
   virtual WebKit::WebFileSystem* fileSystem();
+  virtual WebKit::WebHyphenator* hyphenator();
 
   virtual bool sandboxEnabled();
   virtual WebKit::Platform::FileHandle databaseOpenFile(
@@ -170,11 +170,11 @@ class TestWebKitPlatformSupport :
   scoped_refptr<TestShellWebBlobRegistryImpl> blob_registry_;
   SimpleFileSystem file_system_;
   base::ScopedTempDir file_system_root_;
+  webkit_glue::MockWebHyphenator hyphenator_;
   WebURLLoaderMockFactory url_loader_factory_;
   bool unit_test_mode_;
   WebKit::WebGamepads gamepad_data_;
   WebKit::Platform* shadow_platform_delegate_;
-  HyphenDict* hyphen_dictionary_;
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   WebKit::WebThemeEngine* active_theme_engine_;