Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods

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 ab6fedfd86f278817ec231ed3c78dfe550bceb8b..ca321c3366790f33a5256525ccf19fce649abd9d 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/webkit/support/test_webkit_platform_support.h
@@ -5,6 +5,7 @@
 #ifndef WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
 #define WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
 
+#include "base/compiler_specific.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGamepads.h"
 #include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
@@ -29,64 +30,66 @@ class TestWebKitPlatformSupport :
   explicit TestWebKitPlatformSupport(bool unit_test_mode);
   virtual ~TestWebKitPlatformSupport();
 
-  virtual WebKit::WebMimeRegistry* mimeRegistry();
-  virtual WebKit::WebClipboard* clipboard();
-  virtual WebKit::WebFileUtilities* fileUtilities();
-  virtual WebKit::WebSandboxSupport* sandboxSupport();
-  virtual WebKit::WebCookieJar* cookieJar();
-  virtual WebKit::WebBlobRegistry* blobRegistry();
-  virtual WebKit::WebFileSystem* fileSystem();
+  virtual WebKit::WebMimeRegistry* mimeRegistry() OVERRIDE;
+  virtual WebKit::WebClipboard* clipboard() OVERRIDE;
+  virtual WebKit::WebFileUtilities* fileUtilities() OVERRIDE;
+  virtual WebKit::WebSandboxSupport* sandboxSupport() OVERRIDE;
+  virtual WebKit::WebCookieJar* cookieJar() OVERRIDE;
+  virtual WebKit::WebBlobRegistry* blobRegistry() OVERRIDE;
+  virtual WebKit::WebFileSystem* fileSystem() OVERRIDE;
 
-  virtual bool sandboxEnabled();
+  virtual bool sandboxEnabled() OVERRIDE;
   virtual WebKit::WebKitPlatformSupport::FileHandle databaseOpenFile(
-      const WebKit::WebString& vfs_file_name, int desired_flags);
+      const WebKit::WebString& vfs_file_name, int desired_flags) OVERRIDE;
   virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,
-                                 bool sync_dir);
+                                 bool sync_dir) OVERRIDE;
   virtual long databaseGetFileAttributes(
-      const WebKit::WebString& vfs_file_name);
+      const WebKit::WebString& vfs_file_name) OVERRIDE;
   virtual long long databaseGetFileSize(
-      const WebKit::WebString& vfs_file_name);
+      const WebKit::WebString& vfs_file_name) OVERRIDE;
   virtual long long databaseGetSpaceAvailableForOrigin(
-      const WebKit::WebString& origin_identifier);
+      const WebKit::WebString& origin_identifier) OVERRIDE;
   virtual unsigned long long visitedLinkHash(const char* canonicalURL,
-                                             size_t length);
-  virtual bool isLinkVisited(unsigned long long linkHash);
-  virtual WebKit::WebMessagePortChannel* createMessagePortChannel();
-  virtual void prefetchHostName(const WebKit::WebString&);
-  virtual WebKit::WebURLLoader* createURLLoader();
-  virtual WebKit::WebData loadResource(const char* name);
+                                             size_t length) OVERRIDE;
+  virtual bool isLinkVisited(unsigned long long linkHash) OVERRIDE;
+  virtual WebKit::WebMessagePortChannel* createMessagePortChannel() OVERRIDE;
+  virtual void prefetchHostName(const WebKit::WebString&) OVERRIDE;
+  virtual WebKit::WebURLLoader* createURLLoader() OVERRIDE;
+  virtual WebKit::WebData loadResource(const char* name) OVERRIDE;
   virtual WebKit::WebString queryLocalizedString(
-      WebKit::WebLocalizedString::Name name);
+      WebKit::WebLocalizedString::Name name) OVERRIDE;
   virtual WebKit::WebString queryLocalizedString(
-      WebKit::WebLocalizedString::Name name, const WebKit::WebString& value);
+      WebKit::WebLocalizedString::Name name,
+      const WebKit::WebString& value) OVERRIDE;
   virtual WebKit::WebString queryLocalizedString(
       WebKit::WebLocalizedString::Name name,
-      const WebKit::WebString& value1, const WebKit::WebString& value2);
-  virtual WebKit::WebString defaultLocale();
+      const WebKit::WebString& value1,
+      const WebKit::WebString& value2) OVERRIDE;
+  virtual WebKit::WebString defaultLocale() OVERRIDE;
   virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(
-      const WebKit::WebString& path, unsigned quota);
+      const WebKit::WebString& path, unsigned quota) OVERRIDE;
 
   virtual void dispatchStorageEvent(const WebKit::WebString& key,
       const WebKit::WebString& old_value, const WebKit::WebString& new_value,
       const WebKit::WebString& origin, const WebKit::WebURL& url,
-      bool is_local_storage);
-  virtual WebKit::WebIDBFactory* idbFactory();
+      bool is_local_storage) OVERRIDE;
+  virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE;
   virtual void createIDBKeysFromSerializedValuesAndKeyPath(
       const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
       const WebKit::WebString& keyPath,
-      WebKit::WebVector<WebKit::WebIDBKey>& keys_out);
+      WebKit::WebVector<WebKit::WebIDBKey>& keys_out) OVERRIDE;
   virtual WebKit::WebSerializedScriptValue injectIDBKeyIntoSerializedValue(
       const WebKit::WebIDBKey& key,
       const WebKit::WebSerializedScriptValue& value,
-      const WebKit::WebString& keyPath);
+      const WebKit::WebString& keyPath) OVERRIDE;
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void SetThemeEngine(WebKit::WebThemeEngine* engine);
-  virtual WebKit::WebThemeEngine *themeEngine();
+  virtual WebKit::WebThemeEngine *themeEngine() OVERRIDE;
 #endif
 
-  virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository();
-  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D();
+  virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() OVERRIDE;
 
   WebURLLoaderMockFactory* url_loader_factory() {
     return &url_loader_factory_;
@@ -98,15 +101,26 @@ class TestWebKitPlatformSupport :
 
   // Mock out the WebAudioDevice since the real one
   // talks with the browser process.
-  virtual double audioHardwareSampleRate();
-  virtual size_t audioHardwareBufferSize();
+  virtual double audioHardwareSampleRate() OVERRIDE;
+  virtual size_t audioHardwareBufferSize() OVERRIDE;
   virtual WebKit::WebAudioDevice* createAudioDevice(size_t bufferSize,
       unsigned numberOfChannels, double sampleRate,
-      WebKit::WebAudioDevice::RenderCallback*);
+      WebKit::WebAudioDevice::RenderCallback*) OVERRIDE;
 
   virtual void sampleGamepads(WebKit::WebGamepads& data);
   void setGamepadData(const WebKit::WebGamepads& data);
 
+  virtual string16 GetLocalizedString(int message_id) OVERRIDE;
+  virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE;
+  virtual void GetPlugins(bool refresh,
+                          std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
+  virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
+      const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
+      OVERRIDE;
+  virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge(
+      WebKit::WebSocketStreamHandle* handle,
+      webkit_glue::WebSocketStreamHandleDelegate* delegate) OVERRIDE;
+
  private:
   TestShellWebMimeRegistryImpl mime_registry_;
   MockWebClipboardImpl mock_clipboard_;