Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods

content/renderer/renderer_webkitplatformsupport_impl.h

Index: content/renderer/renderer_webkitplatformsupport_impl.h
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h
index 831ab585dee1b5e5ea16ed294494908e1fd96655..5f26030bb6fdb91319ca850cd273669bb785c014 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.h
+++ b/content/renderer/renderer_webkitplatformsupport_impl.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "content/common/content_export.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
+#include "content/common/content_webkitplatformsupport_impl.h"
 
 class WebSharedWorkerRepositoryImpl;
 class WebFileSystemImpl;
@@ -24,70 +24,73 @@ class WebClipboardImpl;
 }
 
 class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
-    : NON_EXPORTED_BASE(public webkit_glue::WebKitPlatformSupportImpl) {
+    : public ContentWebKitPlatformSupportImpl {
  public:
   RendererWebKitPlatformSupportImpl();
   virtual ~RendererWebKitPlatformSupportImpl();
 
   // WebKitPlatformSupport methods:
-  virtual WebKit::WebClipboard* clipboard();
-  virtual WebKit::WebMimeRegistry* mimeRegistry();
-  virtual WebKit::WebFileUtilities* fileUtilities();
-  virtual WebKit::WebSandboxSupport* sandboxSupport();
-  virtual WebKit::WebCookieJar* cookieJar();
-  virtual bool sandboxEnabled();
+  virtual WebKit::WebClipboard* clipboard() OVERRIDE;
+  virtual WebKit::WebMimeRegistry* mimeRegistry() OVERRIDE;
+  virtual WebKit::WebFileUtilities* fileUtilities() OVERRIDE;
+  virtual WebKit::WebSandboxSupport* sandboxSupport() OVERRIDE;
+  virtual WebKit::WebCookieJar* cookieJar() OVERRIDE;
+  virtual bool sandboxEnabled() 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&);
+      const char* canonicalURL, 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 void cacheMetadata(
-      const WebKit::WebURL&, double, const char*, size_t);
-  virtual WebKit::WebString defaultLocale();
-  virtual void suddenTerminationChanged(bool enabled);
+      const WebKit::WebURL&, double, const char*, size_t) OVERRIDE;
+  virtual WebKit::WebString defaultLocale() OVERRIDE;
+  virtual void suddenTerminationChanged(bool enabled) 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);
+      const WebKit::WebURL& url, bool is_local_storage) 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 WebKit::WebString signedPublicKeyAndChallengeString(
       unsigned key_size_index,
       const WebKit::WebString& challenge,
-      const WebKit::WebURL& url);
-  virtual WebKit::WebIDBFactory* idbFactory();
+      const WebKit::WebURL& url) OVERRIDE;
+  virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE;
   virtual void createIDBKeysFromSerializedValuesAndKeyPath(
       const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
       const WebKit::WebString& keyPath,
-      WebKit::WebVector<WebKit::WebIDBKey>& keys);
+      WebKit::WebVector<WebKit::WebIDBKey>& keys) OVERRIDE;
   virtual WebKit::WebSerializedScriptValue injectIDBKeyIntoSerializedValue(
       const WebKit::WebIDBKey& key,
       const WebKit::WebSerializedScriptValue& value,
-      const WebKit::WebString& keyPath);
-  virtual WebKit::WebFileSystem* fileSystem();
+      const WebKit::WebString& keyPath) OVERRIDE;
+  virtual WebKit::WebFileSystem* fileSystem() OVERRIDE;
 
-  virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository();
-  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D();
-  virtual double audioHardwareSampleRate();
-  virtual size_t audioHardwareBufferSize();
+  virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() OVERRIDE;
+  virtual double audioHardwareSampleRate() OVERRIDE;
+  virtual size_t audioHardwareBufferSize() OVERRIDE;
   virtual WebKit::WebAudioDevice* createAudioDevice(
       size_t buffer_size, unsigned channels, double sample_rate,
-      WebKit::WebAudioDevice::RenderCallback* callback);
+      WebKit::WebAudioDevice::RenderCallback* callback) OVERRIDE;
 
-  virtual WebKit::WebBlobRegistry* blobRegistry();
+  virtual WebKit::WebBlobRegistry* blobRegistry() OVERRIDE;
 
-  virtual WebKit::WebString userAgent(const WebKit::WebURL& url);
+  virtual WebKit::WebString userAgent(const WebKit::WebURL& url) OVERRIDE;
+
+  virtual void GetPlugins(bool refresh,

[jam, 2011/11/19 23:13:46]

nit: here and above (not your fault), please remove the unnecessary blank lines

[piman, 2011/11/21 22:05:04]

Done.

+                          std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
 
  private:
   bool CheckPreparsedJsCachingEnabled() const;