Fix the last of the #includes and OVERRIDEs in preparation for removing...

Fix the last of the #includes and OVERRIDEs in preparation for removing WebKitPlatformSupport upstream.

Review URL: https://chromiumcodereview.appspot.com/11821025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175875 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/renderer_webkitplatformsupport_impl.cc

@@ -40,7 +40,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"

content/renderer/renderer_webkitplatformsupport_impl.h

@@ -10,6 +10,7 @@
 #include "base/platform_file.h"
 #include "content/common/content_export.h"
 #include "content/common/webkitplatformsupport_impl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 

content/worker/worker_webkitplatformsupport_impl.h

@@ -8,6 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMimeRegistry.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
 
 namespace WebKit {
 class WebFileUtilities;
@@ -61,7 +62,7 @@ class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl,
 
   virtual WebKit::WebBlobRegistry* blobRegistry();
 
-  virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE;
+  virtual WebKit::WebIDBFactory* idbFactory();
 
   // WebMimeRegistry methods:
   virtual WebKit::WebMimeRegistry::SupportsType supportsMIMEType(

webkit/support/test_webkit_platform_support.h

@@ -36,50 +36,50 @@ class TestWebKitPlatformSupport :
                             WebKit::Platform* shadow_platform_delegate);
   virtual ~TestWebKitPlatformSupport();
 
-  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() OVERRIDE;
+  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 bool sandboxEnabled();
   virtual WebKit::WebKitPlatformSupport::FileHandle databaseOpenFile(
-      const WebKit::WebString& vfs_file_name, int desired_flags) OVERRIDE;
+      const WebKit::WebString& vfs_file_name, int desired_flags);
   virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,
-                                 bool sync_dir) OVERRIDE;
+                                 bool sync_dir);
   virtual long databaseGetFileAttributes(
-      const WebKit::WebString& vfs_file_name) OVERRIDE;
+      const WebKit::WebString& vfs_file_name);
   virtual long long databaseGetFileSize(
-      const WebKit::WebString& vfs_file_name) OVERRIDE;
+      const WebKit::WebString& vfs_file_name);
   virtual long long databaseGetSpaceAvailableForOrigin(
-      const WebKit::WebString& origin_identifier) OVERRIDE;
+      const WebKit::WebString& origin_identifier);
   virtual unsigned long long visitedLinkHash(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 WebKit::WebURLLoader* createURLLoader() OVERRIDE;
-  virtual WebKit::WebData loadResource(const char* name) OVERRIDE;
+                                             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);
   virtual WebKit::WebString queryLocalizedString(
-      WebKit::WebLocalizedString::Name name) OVERRIDE;
+      WebKit::WebLocalizedString::Name name);
   virtual WebKit::WebString queryLocalizedString(
       WebKit::WebLocalizedString::Name name,
-      const WebKit::WebString& value) OVERRIDE;
+      const WebKit::WebString& value);
   virtual WebKit::WebString queryLocalizedString(
       WebKit::WebLocalizedString::Name name,
       const WebKit::WebString& value1,
-      const WebKit::WebString& value2) OVERRIDE;
-  virtual WebKit::WebString defaultLocale() OVERRIDE;
+      const WebKit::WebString& value2);
+  virtual WebKit::WebString defaultLocale();
   virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(
-      const WebKit::WebString& path, unsigned quota) OVERRIDE;
+      const WebKit::WebString& path, unsigned quota);
 
-  virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE;
+  virtual WebKit::WebIDBFactory* idbFactory();
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void SetThemeEngine(WebKit::WebThemeEngine* engine);
-  virtual WebKit::WebThemeEngine *themeEngine() OVERRIDE;
+  virtual WebKit::WebThemeEngine *themeEngine();
 #endif
 
   virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
@@ -96,11 +96,11 @@ class TestWebKitPlatformSupport :
 
   // Mock out the WebAudioDevice since the real one
   // talks with the browser process.
-  virtual double audioHardwareSampleRate() OVERRIDE;
-  virtual size_t audioHardwareBufferSize() OVERRIDE;
+  virtual double audioHardwareSampleRate();
+  virtual size_t audioHardwareBufferSize();
   virtual WebKit::WebAudioDevice* createAudioDevice(size_t bufferSize,
       unsigned numberOfChannels, double sampleRate,
-      WebKit::WebAudioDevice::RenderCallback*) OVERRIDE;
+      WebKit::WebAudioDevice::RenderCallback*);
 
   virtual void sampleGamepads(WebKit::WebGamepads& data);
   void setGamepadData(const WebKit::WebGamepads& data);
@@ -113,26 +113,26 @@ class TestWebKitPlatformSupport :
                           std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
   virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
       const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
-      OVERRIDE;
+     OVERRIDE;
   virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge(
       WebKit::WebSocketStreamHandle* handle,
       webkit_glue::WebSocketStreamHandleDelegate* delegate) OVERRIDE;
 
   virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(
-      WebKit::WebMediaStreamCenterClient* client) OVERRIDE;
+      WebKit::WebMediaStreamCenterClient* client);
   virtual WebKit::WebRTCPeerConnectionHandler* createRTCPeerConnectionHandler(
-      WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;
-  virtual bool canHyphenate(const WebKit::WebString& locale) OVERRIDE;
+      WebKit::WebRTCPeerConnectionHandlerClient* client);
+  virtual bool canHyphenate(const WebKit::WebString& locale);
   virtual size_t computeLastHyphenLocation(
       const char16* characters,
       size_t length,
       size_t before_index,
-      const WebKit::WebString& locale) OVERRIDE;
+      const WebKit::WebString& locale);
 
   virtual WebKit::WebGestureCurve* createFlingAnimationCurve(
       int device_source,
       const WebKit::WebFloatPoint& velocity,
-      const WebKit::WebSize& cumulative_scroll) OVERRIDE;
+      const WebKit::WebSize& cumulative_scroll);
 
  private:
   TestShellWebMimeRegistryImpl mime_registry_;