content: Rename all classes with WebKitPlatform to BlinkPlatform.

BUG=359244
TEST=None
R=avi@chromium.org

Review URL: https://codereview.chromium.org/628793003

Cr-Commit-Position: refs/heads/master@{#298176}

36 files changed, 315 insertions, 329 deletions

diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc
index 00b5600..48dfe7f 100644
--- a/content/browser/android/content_view_statics.cc
+++ b/content/browser/android/content_view_statics.cc
@@ -32,7 +32,7 @@ namespace {
 // This tracks the renderer processes that received a suspend request. It's
 // important on resume to only resume the renderer processes that were actually
 // suspended as opposed to all the current renderer processes because the
-// suspend calls are refcounted within WebKitPlatformSupport and it expects a
+// suspend calls are refcounted within BlinkPlatformImpl and it expects a
 // perfectly matched number of resume calls.
 // Note that this class is only accessed from the UI thread.
 class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
diff --git a/content/browser/net/view_blob_internals_job_factory.h b/content/browser/net/view_blob_internals_job_factory.h
index b1aaaf7..cc8bd14 100644
--- a/content/browser/net/view_blob_internals_job_factory.h
+++ b/content/browser/net/view_blob_internals_job_factory.h
@@ -9,10 +9,11 @@ namespace net {
 class NetworkDelegate;
 class URLRequest;
 class URLRequestJob;
-}  // namespace net
+}
+
 namespace storage {
 class BlobStorageContext;
-}  // webkit_blob
+}
 
 class GURL;
 
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.cc b/content/browser/renderer_host/sandbox_ipc_linux.cc
index b2dd3f8..b2e024e 100644
--- a/content/browser/renderer_host/sandbox_ipc_linux.cc
+++ b/content/browser/renderer_host/sandbox_ipc_linux.cc
@@ -443,7 +443,7 @@ void SandboxIPCHandler::SendRendererReply(
 
 SandboxIPCHandler::~SandboxIPCHandler() {
   paths_.deleteAll();
-  if (webkit_platform_support_)
+  if (blink_platform_impl_)
     blink::shutdownWithoutV8();
 
   if (IGNORE_EINTR(close(lifeline_fd_)) < 0)
@@ -453,10 +453,10 @@ SandboxIPCHandler::~SandboxIPCHandler() {
 }
 
 void SandboxIPCHandler::EnsureWebKitInitialized() {
-  if (webkit_platform_support_)
+  if (blink_platform_impl_)
     return;
-  webkit_platform_support_.reset(new BlinkPlatformImpl);
-  blink::initializeWithoutV8(webkit_platform_support_.get());
+  blink_platform_impl_.reset(new BlinkPlatformImpl);
+  blink::initializeWithoutV8(blink_platform_impl_.get());
 }
 
 }  // namespace content
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.h b/content/browser/renderer_host/sandbox_ipc_linux.h
index fc986a6..4c39a31 100644
--- a/content/browser/renderer_host/sandbox_ipc_linux.h
+++ b/content/browser/renderer_host/sandbox_ipc_linux.h
@@ -76,7 +76,7 @@ class SandboxIPCHandler : public base::DelegateSimpleThread::Delegate {
 
   const int lifeline_fd_;
   const int browser_socket_;
-  scoped_ptr<BlinkPlatformImpl> webkit_platform_support_;
+  scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
   SkTDArray<SkString*> paths_;
 
   DISALLOW_COPY_AND_ASSIGN(SandboxIPCHandler);
diff --git a/content/child/database_util.h b/content/child/database_util.h
index 8be607c..c53e7ce 100644
--- a/content/child/database_util.h
+++ b/content/child/database_util.h
@@ -12,8 +12,9 @@ class SyncMessageFilter;
 }
 
 namespace content {
-// A class of utility functions used by RendererWebKitPlatformSupportImpl and
-// WorkerWebKitPlatformSupportImpl to handle database file accesses.
+
+// A class of utility functions used by RendererBlinkPlatformImpl to handle
+// database file accesses.
 class DatabaseUtil {
  public:
   static blink::Platform::FileHandle DatabaseOpenFile(
diff --git a/content/child/resource_loader_bridge.h b/content/child/resource_loader_bridge.h
index 7dbc48d..759f832 100644
--- a/content/child/resource_loader_bridge.h
+++ b/content/child/resource_loader_bridge.h
@@ -35,7 +35,7 @@ struct SyncLoadResponse;
 // now that it lives in content/.
 class CONTENT_EXPORT ResourceLoaderBridge {
  public:
-  // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but
+  // use BlinkPlatformImpl::CreateResourceLoader() for construction, but
   // anybody can delete at any time, INCLUDING during processing of callbacks.
   virtual ~ResourceLoaderBridge();
 
@@ -78,8 +78,7 @@ class CONTENT_EXPORT ResourceLoaderBridge {
   virtual void SyncLoad(SyncLoadResponse* response) = 0;
 
  protected:
-  // Construction must go through
-  // WebKitPlatformSupportImpl::CreateResourceLoader()
+  // Construction must go through BlinkPlatformImpl::CreateResourceLoader().
   // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload
   // methods may be called to construct the body of the request.
   ResourceLoaderBridge();
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 94d6874..13df96f 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -91,7 +91,7 @@ class GpuCommandBufferMemoryTracker : public gpu::gles2::MemoryTracker {
 // url_hash matches.
 void FastSetActiveURL(const GURL& url, size_t url_hash) {
   // Leave the previously set URL in the empty case -- empty URLs are given by
-  // WebKitPlatformSupportImpl::createOffscreenGraphicsContext3D. Hopefully the
+  // BlinkPlatformImpl::createOffscreenGraphicsContext3D. Hopefully the
   // onscreen context URL was set previously and will show up even when a crash
   // occurs during offscreen command processing.
   if (url.is_empty())
diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi
index 2376b80..8731034 100644
--- a/content/content_ppapi_plugin.gypi
+++ b/content/content_ppapi_plugin.gypi
@@ -19,12 +19,12 @@
         'ppapi_plugin/broker_process_dispatcher.h',
         'ppapi_plugin/plugin_process_dispatcher.cc',
         'ppapi_plugin/plugin_process_dispatcher.h',
+        'ppapi_plugin/ppapi_blink_platform_impl.cc',
+        'ppapi_plugin/ppapi_blink_platform_impl.h',
         'ppapi_plugin/ppapi_broker_main.cc',
         'ppapi_plugin/ppapi_plugin_main.cc',
         'ppapi_plugin/ppapi_thread.cc',
         'ppapi_plugin/ppapi_thread.h',
-        'ppapi_plugin/ppapi_webkitplatformsupport_impl.cc',
-        'ppapi_plugin/ppapi_webkitplatformsupport_impl.h',
       ],
       'include_dirs': [
         '..',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 7ad20e5..78edaf8 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -340,6 +340,8 @@
       'renderer/render_widget.h',
       'renderer/render_widget_fullscreen.cc',
       'renderer/render_widget_fullscreen.h',
+      'renderer/renderer_blink_platform_impl.cc',
+      'renderer/renderer_blink_platform_impl.h',
       'renderer/renderer_clipboard_client.cc',
       'renderer/renderer_clipboard_client.h',
       'renderer/renderer_font_platform_win.cc',
@@ -356,8 +358,6 @@
       'renderer/renderer_webcolorchooser_impl.h',
       'renderer/renderer_webcookiejar_impl.cc',
       'renderer/renderer_webcookiejar_impl.h',
-      'renderer/renderer_webkitplatformsupport_impl.cc',
-      'renderer/renderer_webkitplatformsupport_impl.h',
       'renderer/resizing_mode_selector.cc',
       'renderer/resizing_mode_selector.h',
       'renderer/sad_plugin.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index d26c798..56b6f71 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -130,6 +130,8 @@
       'test/net/url_request_slow_download_job.h',
       'test/ppapi_unittest.cc',
       'test/ppapi_unittest.h',
+      'test/test_blink_web_unit_test_support.cc',
+      'test/test_blink_web_unit_test_support.h',
       'test/test_content_browser_client.cc',
       'test/test_content_browser_client.h',
       'test/test_content_client.cc',
@@ -146,8 +148,6 @@
       'test/test_render_view_host_factory.h',
       'test/test_web_contents.cc',
       'test/test_web_contents.h',
-      'test/test_webkit_platform_support.cc',
-      'test/test_webkit_platform_support.h',
       'test/web_gesture_curve_mock.cc',
       'test/web_gesture_curve_mock.h',
       'test/web_layer_tree_view_impl_for_testing.cc',
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index bec0f98..ddef4ee8 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -93,9 +93,9 @@ PluginThread::PluginThread()
 
   channel()->AddFilter(new EnsureTerminateMessageFilter());
 
-  // This is needed because we call some code which uses WebKit strings.
-  webkit_platform_support_.reset(new BlinkPlatformImpl);
-  blink::initialize(webkit_platform_support_.get());
+  // This is needed because we call some code which uses Blink strings.
+  blink_platform_impl_.reset(new BlinkPlatformImpl);
+  blink::initialize(blink_platform_impl_.get());
 }
 
 PluginThread::~PluginThread() {
diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h
index f76cfa1..55c498a 100644
--- a/content/plugin/plugin_thread.h
+++ b/content/plugin/plugin_thread.h
@@ -52,7 +52,7 @@ class PluginThread : public ChildThread {
 
   bool forcefully_terminate_plugin_process_;
 
-  scoped_ptr<BlinkPlatformImpl> webkit_platform_support_;
+  scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginThread);
 };
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index 6c111ec..eff00a52 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -10,12 +10,12 @@ source_set("ppapi_plugin") {
     "broker_process_dispatcher.h",
     "plugin_process_dispatcher.cc",
     "plugin_process_dispatcher.h",
+    "ppapi_blink_platform_impl.cc",
+    "ppapi_blink_platform_impl.h",
     "ppapi_broker_main.cc",
     "ppapi_plugin_main.cc",
     "ppapi_thread.cc",
     "ppapi_thread.h",
-    "ppapi_webkitplatformsupport_impl.cc",
-    "ppapi_webkitplatformsupport_impl.h",
   ]
 
   configs += [ "//content:content_implementation" ]
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_blink_platform_impl.cc
index c4a1153..0904975 100644
--- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
+++ b/content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
+#include "content/ppapi_plugin/ppapi_blink_platform_impl.h"
 
 #include <map>
 
@@ -38,16 +38,14 @@ typedef struct CGFont* CGFontRef;
 
 namespace content {
 
-class PpapiWebKitPlatformSupportImpl::SandboxSupport
-    : public WebSandboxSupport {
+class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport {
  public:
   virtual ~SandboxSupport() {}
 
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
-  virtual bool loadFont(
-      NSFont* srcFont, CGFontRef* out, uint32_t* fontID);
+  virtual bool loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID);
 #elif defined(OS_ANDROID)
   // Empty class.
 #elif defined(OS_POSIX)
@@ -56,8 +54,9 @@ class PpapiWebKitPlatformSupportImpl::SandboxSupport
       WebUChar32 character,
       const char* preferred_locale,
       blink::WebFallbackFont* fallbackFont);
-  virtual void getRenderStyleForStrike(
-      const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out);
+  virtual void getRenderStyleForStrike(const char* family,
+                                       int sizeAndStyle,
+                                       blink::WebFontRenderStyle* out);
 
  private:
   // WebKit likes to ask us for the correct font family to use for a set of
@@ -71,8 +70,7 @@ class PpapiWebKitPlatformSupportImpl::SandboxSupport
 
 #if defined(OS_WIN)
 
-bool PpapiWebKitPlatformSupportImpl::SandboxSupport::ensureFontLoaded(
-    HFONT font) {
+bool PpapiBlinkPlatformImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
 
@@ -84,12 +82,11 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::ensureFontLoaded(
 
 #elif defined(OS_MACOSX)
 
-bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
-    NSFont* src_font,
-    CGFontRef* out,
-    uint32_t* font_id) {
+bool PpapiBlinkPlatformImpl::SandboxSupport::loadFont(NSFont* src_font,
+                                                      CGFontRef* out,
+                                                      uint32_t* font_id) {
   // TODO(brettw) this should do the something similar to what
-  // RendererWebKitClientImpl does and request that the browser load the font.
+  // RendererBlinkPlatformImpl does and request that the browser load the font.
   // Note: need to unlock the proxy lock like ensureFontLoaded does.
   NOTIMPLEMENTED();
   return false;
@@ -101,12 +98,11 @@ bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
 
 #elif defined(OS_POSIX)
 
-PpapiWebKitPlatformSupportImpl::SandboxSupport::SandboxSupport()
+PpapiBlinkPlatformImpl::SandboxSupport::SandboxSupport()
     : creation_thread_(base::PlatformThread::CurrentId()) {
 }
 
-void
-PpapiWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
+void PpapiBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
     WebUChar32 character,
     const char* preferred_locale,
     blink::WebFallbackFont* fallbackFont) {
@@ -129,64 +125,65 @@ PpapiWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
   unicode_font_families_.insert(std::make_pair(character, *fallbackFont));
 }
 
-void PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
-    const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out) {
+void PpapiBlinkPlatformImpl::SandboxSupport::getRenderStyleForStrike(
+    const char* family,
+    int sizeAndStyle,
+    blink::WebFontRenderStyle* out) {
   GetRenderStyleForStrike(family, sizeAndStyle, out);
 }
 
 #endif
 
-PpapiWebKitPlatformSupportImpl::PpapiWebKitPlatformSupportImpl()
-    : sandbox_support_(new PpapiWebKitPlatformSupportImpl::SandboxSupport()) {
+PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl()
+    : sandbox_support_(new PpapiBlinkPlatformImpl::SandboxSupport()) {
 }
 
-PpapiWebKitPlatformSupportImpl::~PpapiWebKitPlatformSupportImpl() {
+PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
 }
 
-void PpapiWebKitPlatformSupportImpl::Shutdown() {
+void PpapiBlinkPlatformImpl::Shutdown() {
   // SandboxSupport contains a map of WebFontFamily objects, which hold
   // WebCStrings, which become invalidated when blink is shut down. Hence, we
   // need to clear that map now, just before blink::shutdown() is called.
   sandbox_support_.reset();
 }
 
-blink::WebClipboard* PpapiWebKitPlatformSupportImpl::clipboard() {
+blink::WebClipboard* PpapiBlinkPlatformImpl::clipboard() {
   NOTREACHED();
   return NULL;
 }
 
-blink::WebMimeRegistry* PpapiWebKitPlatformSupportImpl::mimeRegistry() {
+blink::WebMimeRegistry* PpapiBlinkPlatformImpl::mimeRegistry() {
   NOTREACHED();
   return NULL;
 }
 
-blink::WebFileUtilities* PpapiWebKitPlatformSupportImpl::fileUtilities() {
+blink::WebFileUtilities* PpapiBlinkPlatformImpl::fileUtilities() {
   NOTREACHED();
   return NULL;
 }
 
-blink::WebSandboxSupport* PpapiWebKitPlatformSupportImpl::sandboxSupport() {
+blink::WebSandboxSupport* PpapiBlinkPlatformImpl::sandboxSupport() {
   return sandbox_support_.get();
 }
 
-bool PpapiWebKitPlatformSupportImpl::sandboxEnabled() {
+bool PpapiBlinkPlatformImpl::sandboxEnabled() {
   return true;  // Assume PPAPI is always sandboxed.
 }
 
-unsigned long long PpapiWebKitPlatformSupportImpl::visitedLinkHash(
+unsigned long long PpapiBlinkPlatformImpl::visitedLinkHash(
     const char* canonical_url,
     size_t length) {
   NOTREACHED();
   return 0;
 }
 
-bool PpapiWebKitPlatformSupportImpl::isLinkVisited(
-    unsigned long long link_hash) {
+bool PpapiBlinkPlatformImpl::isLinkVisited(unsigned long long link_hash) {
   NOTREACHED();
   return false;
 }
 
-void PpapiWebKitPlatformSupportImpl::createMessageChannel(
+void PpapiBlinkPlatformImpl::createMessageChannel(
     blink::WebMessagePortChannel** channel1,
     blink::WebMessagePortChannel** channel2) {
   NOTREACHED();
@@ -194,66 +191,71 @@ void PpapiWebKitPlatformSupportImpl::createMessageChannel(
   *channel2 = NULL;
 }
 
-void PpapiWebKitPlatformSupportImpl::setCookies(
+void PpapiBlinkPlatformImpl::setCookies(
     const blink::WebURL& url,
     const blink::WebURL& first_party_for_cookies,
     const blink::WebString& value) {
   NOTREACHED();
 }
 
-blink::WebString PpapiWebKitPlatformSupportImpl::cookies(
+blink::WebString PpapiBlinkPlatformImpl::cookies(
     const blink::WebURL& url,
     const blink::WebURL& first_party_for_cookies) {
   NOTREACHED();
   return blink::WebString();
 }
 
-blink::WebString PpapiWebKitPlatformSupportImpl::defaultLocale() {
+blink::WebString PpapiBlinkPlatformImpl::defaultLocale() {
   NOTREACHED();
   return blink::WebString();
 }
 
-blink::WebThemeEngine* PpapiWebKitPlatformSupportImpl::themeEngine() {
+blink::WebThemeEngine* PpapiBlinkPlatformImpl::themeEngine() {
   NOTREACHED();
   return NULL;
 }
 
-blink::WebURLLoader* PpapiWebKitPlatformSupportImpl::createURLLoader() {
+blink::WebURLLoader* PpapiBlinkPlatformImpl::createURLLoader() {
   NOTREACHED();
   return NULL;
 }
 
 blink::WebSocketStreamHandle*
-    PpapiWebKitPlatformSupportImpl::createSocketStreamHandle() {
+PpapiBlinkPlatformImpl::createSocketStreamHandle() {
   NOTREACHED();
   return NULL;
 }
 
-void PpapiWebKitPlatformSupportImpl::getPluginList(bool refresh,
+void PpapiBlinkPlatformImpl::getPluginList(
+    bool refresh,
     blink::WebPluginListBuilder* builder) {
   NOTREACHED();
 }
 
-blink::WebData PpapiWebKitPlatformSupportImpl::loadResource(const char* name) {
+blink::WebData PpapiBlinkPlatformImpl::loadResource(const char* name) {
   NOTREACHED();
   return blink::WebData();
 }
 
 blink::WebStorageNamespace*
-PpapiWebKitPlatformSupportImpl::createLocalStorageNamespace() {
+PpapiBlinkPlatformImpl::createLocalStorageNamespace() {
   NOTREACHED();
   return 0;
 }
 
-void PpapiWebKitPlatformSupportImpl::dispatchStorageEvent(
-    const blink::WebString& key, const blink::WebString& old_value,
-    const blink::WebString& new_value, const blink::WebString& origin,
-    const blink::WebURL& url, bool is_local_storage) {
+void PpapiBlinkPlatformImpl::dispatchStorageEvent(
+    const blink::WebString& key,
+    const blink::WebString& old_value,
+    const blink::WebString& new_value,
+    const blink::WebString& origin,
+    const blink::WebURL& url,
+    bool is_local_storage) {
   NOTREACHED();
 }
 
-int PpapiWebKitPlatformSupportImpl::databaseDeleteFile(
-    const blink::WebString& vfs_file_name, bool sync_dir) {
+int PpapiBlinkPlatformImpl::databaseDeleteFile(
+    const blink::WebString& vfs_file_name,
+    bool sync_dir) {
   NOTREACHED();
   return 0;
 }
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h b/content/ppapi_plugin/ppapi_blink_platform_impl.h
index 3361304..daba3f4 100644
--- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h
+++ b/content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PPAPI_PLUGIN_PPAPI_WEBKITPLATFORMSUPPORT_IMPL_H_
-#define CONTENT_PPAPI_PLUGIN_PPAPI_WEBKITPLATFORMSUPPORT_IMPL_H_
+#ifndef CONTENT_PPAPI_PLUGIN_PPAPI_BLINK_PLATFORM_IMPL_H_
+#define CONTENT_PPAPI_PLUGIN_PPAPI_BLINK_PLATFORM_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -11,15 +11,15 @@
 
 namespace content {
 
-class PpapiWebKitPlatformSupportImpl : public BlinkPlatformImpl {
+class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
  public:
-  PpapiWebKitPlatformSupportImpl();
-  virtual ~PpapiWebKitPlatformSupportImpl();
+  PpapiBlinkPlatformImpl();
+  virtual ~PpapiBlinkPlatformImpl();
 
   // Shutdown must be called just prior to shutting down blink.
   void Shutdown();
 
-  // WebKitPlatformSupport methods:
+  // BlinkPlatformImpl methods:
   virtual blink::WebClipboard* clipboard();
   virtual blink::WebMimeRegistry* mimeRegistry();
   virtual blink::WebFileUtilities* fileUtilities();
@@ -54,9 +54,9 @@ class PpapiWebKitPlatformSupportImpl : public BlinkPlatformImpl {
   class SandboxSupport;
   scoped_ptr<SandboxSupport> sandbox_support_;
 
-  DISALLOW_COPY_AND_ASSIGN(PpapiWebKitPlatformSupportImpl);
+  DISALLOW_COPY_AND_ASSIGN(PpapiBlinkPlatformImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_PPAPI_PLUGIN_PPAPI_WEBKITPLATFORMSUPPORT_IMPL_H_
+#endif  // CONTENT_PPAPI_PLUGIN_PPAPI_BLINK_PLATFORM_IMPL_H_
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index fe5fa1a..142f647 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -24,7 +24,7 @@
 #include "content/common/sandbox_util.h"
 #include "content/ppapi_plugin/broker_process_dispatcher.h"
 #include "content/ppapi_plugin/plugin_process_dispatcher.h"
-#include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
+#include "content/ppapi_plugin/ppapi_blink_platform_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/pepper_plugin_info.h"
@@ -111,8 +111,8 @@ PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker)
   globals->set_command_line(
       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
 
-  webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl);
-  blink::initialize(webkit_platform_support_.get());
+  blink_platform_impl_.reset(new PpapiBlinkPlatformImpl);
+  blink::initialize(blink_platform_impl_.get());
 
   if (!is_broker_) {
     channel()->AddFilter(
@@ -130,7 +130,7 @@ void PpapiThread::Shutdown() {
   ppapi::proxy::PluginGlobals::Get()->ResetPluginProxyDelegate();
   if (plugin_entry_points_.shutdown_module)
     plugin_entry_points_.shutdown_module();
-  webkit_platform_support_->Shutdown();
+  blink_platform_impl_->Shutdown();
   blink::shutdown();
 }
 
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h
index 87ac2cc..505872c 100644
--- a/content/ppapi_plugin/ppapi_thread.h
+++ b/content/ppapi_plugin/ppapi_thread.h
@@ -38,7 +38,7 @@ struct ChannelHandle;
 
 namespace content {
 
-class PpapiWebKitPlatformSupportImpl;
+class PpapiBlinkPlatformImpl;
 
 class PpapiThread : public ChildThread,
                     public ppapi::proxy::PluginDispatcher::PluginDelegate,
@@ -149,8 +149,8 @@ class PpapiThread : public ChildThread,
   std::map<uint32, ppapi::proxy::PluginDispatcher*> plugin_dispatchers_;
   uint32 next_plugin_dispatcher_id_;
 
-  // The WebKitPlatformSupport implementation.
-  scoped_ptr<PpapiWebKitPlatformSupportImpl> webkit_platform_support_;
+  // The BlinkPlatformImpl implementation.
+  scoped_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_;
 
 #if defined(OS_WIN)
   // Caches the handle to the peer process if this is a broker.
diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h
index f155a8c..23354ff 100644
--- a/content/public/test/layouttest_support.h
+++ b/content/public/test/layouttest_support.h
@@ -58,15 +58,15 @@ void FetchManifest(blink::WebView* view, const GURL& url,
 void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider);
 
 // Sets a double that should be used when registering
-// a listener through WebKitPlatformSupport::setDeviceLightListener().
+// a listener through BlinkPlatformImpl::setDeviceLightListener().
 void SetMockDeviceLightData(const double data);
 
 // Sets WebDeviceMotionData that should be used when registering
-// a listener through WebKitPlatformSupport::setDeviceMotionListener().
+// a listener through BlinkPlatformImpl::setDeviceMotionListener().
 void SetMockDeviceMotionData(const blink::WebDeviceMotionData& data);
 
 // Sets WebDeviceOrientationData that should be used when registering
-// a listener through WebKitPlatformSupport::setDeviceOrientationListener().
+// a listener through BlinkPlatformImpl::setDeviceOrientationListener().
 void SetMockDeviceOrientationData(const blink::WebDeviceOrientationData& data);
 
 // Notifies blink that battery status has changed.
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index be2793f..f8f0088 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -19,8 +19,8 @@
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/test/mock_render_process.h"
 #include "content/test/test_content_client.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
@@ -57,27 +57,25 @@ const int32 kSurfaceId = 42;
 
 namespace content {
 
-class RendererWebKitPlatformSupportImplNoSandboxImpl
-    : public RendererWebKitPlatformSupportImpl {
+class RendererBlinkPlatformImplNoSandboxImpl
+    : public RendererBlinkPlatformImpl {
  public:
   virtual blink::WebSandboxSupport* sandboxSupport() {
     return NULL;
   }
 };
 
-RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::
-    RendererWebKitPlatformSupportImplNoSandbox() {
-  webkit_platform_support_.reset(
-      new RendererWebKitPlatformSupportImplNoSandboxImpl());
+RenderViewTest::RendererBlinkPlatformImplNoSandbox::
+    RendererBlinkPlatformImplNoSandbox() {
+  blink_platform_impl_.reset(new RendererBlinkPlatformImplNoSandboxImpl());
 }
 
-RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::
-    ~RendererWebKitPlatformSupportImplNoSandbox() {
+RenderViewTest::RendererBlinkPlatformImplNoSandbox::
+    ~RendererBlinkPlatformImplNoSandbox() {
 }
 
-blink::Platform*
-    RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::Get() {
-  return webkit_platform_support_.get();
+blink::Platform* RenderViewTest::RendererBlinkPlatformImplNoSandbox::Get() {
+  return blink_platform_impl_.get();
 }
 
 RenderViewTest::RenderViewTest()
@@ -167,7 +165,7 @@ void RenderViewTest::SetUp() {
   // hacky, but this is the world we live in...
   std::string flags("--expose-gc");
   v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
-  blink::initialize(webkit_platform_support_.Get());
+  blink::initialize(blink_platform_impl_.Get());
 
   // Ensure that we register any necessary schemes when initializing WebKit,
   // since we are using a MockRenderThread.
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index 7f10ee8..3fefec5 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -34,22 +34,21 @@ class ContentRendererClient;
 class MockRenderProcess;
 class PageState;
 class RendererMainPlatformDelegate;
-class RendererWebKitPlatformSupportImplNoSandboxImpl;
+class RendererBlinkPlatformImplNoSandboxImpl;
 class RenderView;
 
 class RenderViewTest : public testing::Test {
  public:
-  // A special WebKitPlatformSupportImpl class for getting rid off the
-  // dependency to the sandbox, which is not available in RenderViewTest.
-  class RendererWebKitPlatformSupportImplNoSandbox {
+  // A special BlinkPlatformImpl class for getting rid off the dependency to the
+  // sandbox, which is not available in RenderViewTest.
+  class RendererBlinkPlatformImplNoSandbox {
    public:
-    RendererWebKitPlatformSupportImplNoSandbox();
-    ~RendererWebKitPlatformSupportImplNoSandbox();
+    RendererBlinkPlatformImplNoSandbox();
+    ~RendererBlinkPlatformImplNoSandbox();
     blink::Platform* Get();
 
    private:
-    scoped_ptr<RendererWebKitPlatformSupportImplNoSandboxImpl>
-        webkit_platform_support_;
+    scoped_ptr<RendererBlinkPlatformImplNoSandboxImpl> blink_platform_impl_;
   };
 
   RenderViewTest();
@@ -142,7 +141,7 @@ class RenderViewTest : public testing::Test {
   // We use a naked pointer because we don't want to expose RenderViewImpl in
   // the embedder's namespace.
   RenderView* view_;
-  RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_;
+  RendererBlinkPlatformImplNoSandbox blink_platform_impl_;
   scoped_ptr<ContentClient> content_client_;
   scoped_ptr<ContentBrowserClient> content_browser_client_;
   scoped_ptr<ContentRendererClient> content_renderer_client_;
diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc
index 67f3bb4..2a6c6b8 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -8,7 +8,7 @@
 #include "base/rand_util.h"
 #include "base/test/test_suite.h"
 #if !defined(OS_IOS)
-#include "content/test/test_webkit_platform_support.h"
+#include "content/test/test_blink_web_unit_test_support.h"
 #endif
 #include "third_party/WebKit/public/web/WebKit.h"
 
@@ -18,13 +18,13 @@ UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
     : test_suite_(test_suite) {
   DCHECK(test_suite);
 #if !defined(OS_IOS)
-  platform_support_.reset(new TestWebKitPlatformSupport);
+  blink_test_support_.reset(new TestBlinkWebUnitTestSupport);
 #endif
 }
 
 UnitTestTestSuite::~UnitTestTestSuite() {
 #if !defined(OS_IOS)
-  platform_support_.reset();
+  blink_test_support_.reset();
 #endif
 }
 
diff --git a/content/public/test/unittest_test_suite.h b/content/public/test/unittest_test_suite.h
index 5b46ee6..b59cdd0 100644
--- a/content/public/test/unittest_test_suite.h
+++ b/content/public/test/unittest_test_suite.h
@@ -13,7 +13,7 @@ class TestSuite;
 }
 
 namespace content {
-class TestWebKitPlatformSupport;
+class TestBlinkWebUnitTestSupport;
 
 // A special test suite that also initializes WebKit once for all unittests.
 // This is useful for two reasons:
@@ -32,7 +32,7 @@ class UnitTestTestSuite {
   scoped_ptr<base::TestSuite> test_suite_;
 
 #if !defined(OS_IOS)
-  scoped_ptr<TestWebKitPlatformSupport> platform_support_;
+  scoped_ptr<TestBlinkWebUnitTestSupport> blink_test_support_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(UnitTestTestSuite);
diff --git a/content/renderer/gamepad_shared_memory_reader.cc b/content/renderer/gamepad_shared_memory_reader.cc
index 7040a9b..ab75d7e 100644
--- a/content/renderer/gamepad_shared_memory_reader.cc
+++ b/content/renderer/gamepad_shared_memory_reader.cc
@@ -9,7 +9,7 @@
 #include "content/common/gamepad_hardware_buffer.h"
 #include "content/common/gamepad_user_gesture.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/public/platform/WebGamepadListener.h"
 #include "third_party/WebKit/public/platform/WebPlatformEventListener.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index c2da03a..5581284 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -91,7 +91,7 @@
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_view_impl.h"
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 #include "content/renderer/scheduler_proxy_task_runner.h"
 #include "content/renderer/service_worker/embedded_worker_context_message_filter.h"
 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
@@ -594,13 +594,13 @@ void RenderThreadImpl::Shutdown() {
   }
 
   // Wait for all databases to be closed.
-  if (webkit_platform_support_) {
+  if (blink_platform_impl_) {
     // WaitForAllDatabasesToClose might run a nested message loop. To avoid
     // processing timer events while we're already in the process of shutting
     // down blink, put a ScopePageLoadDeferrer on the stack.
     WebView::willEnterModalLoop();
-    webkit_platform_support_->web_database_observer_impl()->
-        WaitForAllDatabasesToClose();
+    blink_platform_impl_->web_database_observer_impl()
+        ->WaitForAllDatabasesToClose();
     WebView::didExitModalLoop();
   }
 
@@ -657,7 +657,7 @@ void RenderThreadImpl::Shutdown() {
 
   main_thread_compositor_task_runner_ = NULL;
 
-  if (webkit_platform_support_)
+  if (blink_platform_impl_)
     blink::shutdown();
 
   lazy_tls.Pointer()->Set(NULL);
@@ -698,7 +698,7 @@ bool RenderThreadImpl::Send(IPC::Message* msg) {
 
   if (pumping_events) {
     if (suspend_webkit_shared_timer)
-      webkit_platform_support_->SuspendSharedTimer();
+      blink_platform_impl_->SuspendSharedTimer();
 
     if (notify_webkit_of_modal_loop)
       WebView::willEnterModalLoop();
@@ -727,7 +727,7 @@ bool RenderThreadImpl::Send(IPC::Message* msg) {
       WebView::didExitModalLoop();
 
     if (suspend_webkit_shared_timer)
-      webkit_platform_support_->ResumeSharedTimer();
+      blink_platform_impl_->ResumeSharedTimer();
   }
 
   return rv;
@@ -834,11 +834,11 @@ void RenderThreadImpl::SetResourceDispatcherDelegate(
 }
 
 void RenderThreadImpl::EnsureWebKitInitialized() {
-  if (webkit_platform_support_)
+  if (blink_platform_impl_)
     return;
 
-  webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl);
-  blink::initialize(webkit_platform_support_.get());
+  blink_platform_impl_.reset(new RendererBlinkPlatformImpl);
+  blink::initialize(blink_platform_impl_.get());
   main_thread_compositor_task_runner_ = base::MessageLoopProxy::current();
 
   v8::Isolate* isolate = blink::mainThreadIsolate();
@@ -1466,9 +1466,9 @@ void RenderThreadImpl::OnPurgePluginListCache(bool reload_pages) {
   // point we already know that the browser has refreshed its list, so disable
   // refresh temporarily to prevent each renderer process causing the list to be
   // regenerated.
-  webkit_platform_support_->set_plugin_refresh_allowed(false);
+  blink_platform_impl_->set_plugin_refresh_allowed(false);
   blink::resetPluginCache(reload_pages);
-  webkit_platform_support_->set_plugin_refresh_allowed(true);
+  blink_platform_impl_->set_plugin_refresh_allowed(true);
 
   FOR_EACH_OBSERVER(RenderProcessObserver, observers_, PluginListChanged());
 }
@@ -1499,9 +1499,9 @@ void RenderThreadImpl::OnSetWebKitSharedTimersSuspended(bool suspend) {
   if (suspend_webkit_shared_timer_) {
     EnsureWebKitInitialized();
     if (suspend) {
-      webkit_platform_support_->SuspendSharedTimer();
+      blink_platform_impl_->SuspendSharedTimer();
     } else {
-      webkit_platform_support_->ResumeSharedTimer();
+      blink_platform_impl_->ResumeSharedTimer();
     }
     webkit_shared_timer_suspended_ = suspend;
   }
@@ -1517,8 +1517,8 @@ void RenderThreadImpl::OnUpdateScrollbarTheme(
     bool redraw) {
   EnsureWebKitInitialized();
   static_cast<WebScrollbarBehaviorImpl*>(
-      webkit_platform_support_->scrollbarBehavior())->set_jump_on_track_click(
-          jump_on_track_click);
+      blink_platform_impl_->scrollbarBehavior())
+      ->set_jump_on_track_click(jump_on_track_click);
   blink::WebScrollbarTheme::updateScrollbars(initial_button_delay,
                                              autoscroll_button_delay,
                                              preferred_scroller_style,
@@ -1544,13 +1544,13 @@ void RenderThreadImpl::OnMemoryPressure(
   // Trigger full v8 garbage collection on critical memory notification. This
   // will potentially hang the renderer for a long time, however, when we
   // receive a memory pressure notification, we might be about to be killed.
-  if (webkit_platform_support_ && blink::mainThreadIsolate()) {
+  if (blink_platform_impl_ && blink::mainThreadIsolate()) {
     blink::mainThreadIsolate()->LowMemoryNotification();
   }
 
   if (memory_pressure_level ==
       base::MemoryPressureListener::MEMORY_PRESSURE_CRITICAL) {
-    if (webkit_platform_support_) {
+    if (blink_platform_impl_) {
       // Clear the image cache. Do not call into blink if it is not initialized.
       blink::WebImageCache::clear();
     }
@@ -1588,7 +1588,7 @@ RenderThreadImpl::GetMediaThreadTaskRunner() {
 }
 
 void RenderThreadImpl::SampleGamepads(blink::WebGamepads* data) {
-  webkit_platform_support_->sampleGamepads(*data);
+  blink_platform_impl_->sampleGamepads(*data);
 }
 
 void RenderThreadImpl::WidgetCreated() {
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 954c074..b1ed5ce 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -95,9 +95,9 @@ class MidiMessageFilter;
 class NetInfoDispatcher;
 class P2PSocketDispatcher;
 class PeerConnectionTracker;
-class RendererDemuxerAndroid;
-class RendererWebKitPlatformSupportImpl;
 class RenderProcessObserver;
+class RendererBlinkPlatformImpl;
+class RendererDemuxerAndroid;
 class VideoCaptureImplManager;
 class WebGraphicsContext3DCommandBufferImpl;
 class WebRTCIdentityService;
@@ -194,9 +194,9 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
     layout_test_mode_ = layout_test_mode;
   }
 
-  RendererWebKitPlatformSupportImpl* webkit_platform_support() const {
-    DCHECK(webkit_platform_support_);
-    return webkit_platform_support_.get();
+  RendererBlinkPlatformImpl* blink_platform_impl() const {
+    DCHECK(blink_platform_impl_);
+    return blink_platform_impl_.get();
   }
 
   scoped_refptr<base::SingleThreadTaskRunner>
@@ -458,7 +458,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
   scoped_ptr<AppCacheDispatcher> appcache_dispatcher_;
   scoped_ptr<DomStorageDispatcher> dom_storage_dispatcher_;
   scoped_ptr<IndexedDBDispatcher> main_thread_indexed_db_dispatcher_;
-  scoped_ptr<RendererWebKitPlatformSupportImpl> webkit_platform_support_;
+  scoped_ptr<RendererBlinkPlatformImpl> blink_platform_impl_;
   scoped_ptr<EmbeddedWorkerDispatcher> embedded_worker_dispatcher_;
 
   // Used on the render thread and deleted by WebKit at shutdown.
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index c17cd7e..b643c4a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -49,7 +49,7 @@
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 #include "content/renderer/resizing_mode_selector.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index d2c087c..3a0ccc3 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -156,7 +156,7 @@ base::LazyInstance<blink::WebDeviceOrientationData>::Leaky
 
 //------------------------------------------------------------------------------
 
-class RendererWebKitPlatformSupportImpl::MimeRegistry
+class RendererBlinkPlatformImpl::MimeRegistry
     : public SimpleWebMimeRegistryImpl {
  public:
   virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
@@ -174,8 +174,7 @@ class RendererWebKitPlatformSupportImpl::MimeRegistry
       const blink::WebString& file_path);
 };
 
-class RendererWebKitPlatformSupportImpl::FileUtilities
-    : public WebFileUtilitiesImpl {
+class RendererBlinkPlatformImpl::FileUtilities : public WebFileUtilitiesImpl {
  public:
   explicit FileUtilities(ThreadSafeSender* sender)
       : thread_safe_sender_(sender) {}
@@ -188,10 +187,9 @@ class RendererWebKitPlatformSupportImpl::FileUtilities
 #if defined(OS_ANDROID)
 // WebKit doesn't use WebSandboxSupport on android so we don't need to
 // implement anything here.
-class RendererWebKitPlatformSupportImpl::SandboxSupport {
-};
+class RendererBlinkPlatformImpl::SandboxSupport {};
 #else
-class RendererWebKitPlatformSupportImpl::SandboxSupport
+class RendererBlinkPlatformImpl::SandboxSupport
     : public blink::WebSandboxSupport {
  public:
   virtual ~SandboxSupport() {}
@@ -223,17 +221,16 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport
 
 //------------------------------------------------------------------------------
 
-RendererWebKitPlatformSupportImpl::RendererWebKitPlatformSupportImpl()
+RendererBlinkPlatformImpl::RendererBlinkPlatformImpl()
     : clipboard_client_(new RendererClipboardClient),
       clipboard_(new WebClipboardImpl(clipboard_client_.get())),
-      mime_registry_(new RendererWebKitPlatformSupportImpl::MimeRegistry),
+      mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry),
       sudden_termination_disables_(0),
       plugin_refresh_allowed_(true),
       child_thread_loop_(base::MessageLoopProxy::current()),
       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
   if (g_sandbox_enabled && sandboxEnabled()) {
-    sandbox_support_.reset(
-        new RendererWebKitPlatformSupportImpl::SandboxSupport);
+    sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
   } else {
     DVLOG(1) << "Disabling sandbox support for testing.";
   }
@@ -250,13 +247,13 @@ RendererWebKitPlatformSupportImpl::RendererWebKitPlatformSupportImpl()
   }
 }
 
-RendererWebKitPlatformSupportImpl::~RendererWebKitPlatformSupportImpl() {
+RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() {
   WebFileSystemImpl::DeleteThreadSpecificInstance();
 }
 
 //------------------------------------------------------------------------------
 
-blink::WebClipboard* RendererWebKitPlatformSupportImpl::clipboard() {
+blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() {
   blink::WebClipboard* clipboard =
       GetContentClient()->renderer()->OverrideWebClipboard();
   if (clipboard)
@@ -264,12 +261,11 @@ blink::WebClipboard* RendererWebKitPlatformSupportImpl::clipboard() {
   return clipboard_.get();
 }
 
-blink::WebMimeRegistry* RendererWebKitPlatformSupportImpl::mimeRegistry() {
+blink::WebMimeRegistry* RendererBlinkPlatformImpl::mimeRegistry() {
   return mime_registry_.get();
 }
 
-blink::WebFileUtilities*
-RendererWebKitPlatformSupportImpl::fileUtilities() {
+blink::WebFileUtilities* RendererBlinkPlatformImpl::fileUtilities() {
   if (!file_utilities_) {
     file_utilities_.reset(new FileUtilities(thread_safe_sender_.get()));
     file_utilities_->set_sandbox_enabled(sandboxEnabled());
@@ -277,7 +273,7 @@ RendererWebKitPlatformSupportImpl::fileUtilities() {
   return file_utilities_.get();
 }
 
-blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
+blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
 #if defined(OS_ANDROID)
   // WebKit doesn't use WebSandboxSupport on android.
   return NULL;
@@ -286,12 +282,12 @@ blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
 #endif
 }
 
-blink::WebCookieJar* RendererWebKitPlatformSupportImpl::cookieJar() {
+blink::WebCookieJar* RendererBlinkPlatformImpl::cookieJar() {
   NOTREACHED() << "Use WebFrameClient::cookieJar() instead!";
   return NULL;
 }
 
-blink::WebThemeEngine* RendererWebKitPlatformSupportImpl::themeEngine() {
+blink::WebThemeEngine* RendererBlinkPlatformImpl::themeEngine() {
   blink::WebThemeEngine* theme_engine =
       GetContentClient()->renderer()->OverrideThemeEngine();
   if (theme_engine)
@@ -299,7 +295,7 @@ blink::WebThemeEngine* RendererWebKitPlatformSupportImpl::themeEngine() {
   return BlinkPlatformImpl::themeEngine();
 }
 
-bool RendererWebKitPlatformSupportImpl::sandboxEnabled() {
+bool RendererBlinkPlatformImpl::sandboxEnabled() {
   // As explained in Platform.h, this function is used to decide
   // whether to allow file system operations to come out of WebKit or not.
   // Even if the sandbox is disabled, there's no reason why the code should
@@ -310,18 +306,17 @@ bool RendererWebKitPlatformSupportImpl::sandboxEnabled() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 }
 
-unsigned long long RendererWebKitPlatformSupportImpl::visitedLinkHash(
+unsigned long long RendererBlinkPlatformImpl::visitedLinkHash(
     const char* canonical_url,
     size_t length) {
   return GetContentClient()->renderer()->VisitedLinkHash(canonical_url, length);
 }
 
-bool RendererWebKitPlatformSupportImpl::isLinkVisited(
-    unsigned long long link_hash) {
+bool RendererBlinkPlatformImpl::isLinkVisited(unsigned long long link_hash) {
   return GetContentClient()->renderer()->IsLinkVisited(link_hash);
 }
 
-void RendererWebKitPlatformSupportImpl::createMessageChannel(
+void RendererBlinkPlatformImpl::createMessageChannel(
     blink::WebMessagePortChannel** channel1,
     blink::WebMessagePortChannel** channel2) {
   WebMessagePortChannelImpl::CreatePair(
@@ -329,15 +324,14 @@ void RendererWebKitPlatformSupportImpl::createMessageChannel(
 }
 
 blink::WebPrescientNetworking*
-RendererWebKitPlatformSupportImpl::prescientNetworking() {
+RendererBlinkPlatformImpl::prescientNetworking() {
   return GetContentClient()->renderer()->GetPrescientNetworking();
 }
 
-void RendererWebKitPlatformSupportImpl::cacheMetadata(
-    const blink::WebURL& url,
-    double response_time,
-    const char* data,
-    size_t size) {
+void RendererBlinkPlatformImpl::cacheMetadata(const blink::WebURL& url,
+                                              double response_time,
+                                              const char* data,
+                                              size_t size) {
   // Let the browser know we generated cacheable metadata for this resource. The
   // browser may cache it and return it on subsequent responses to speed
   // the processing of this resource.
@@ -346,11 +340,11 @@ void RendererWebKitPlatformSupportImpl::cacheMetadata(
       new ViewHostMsg_DidGenerateCacheableMetadata(url, response_time, copy));
 }
 
-WebString RendererWebKitPlatformSupportImpl::defaultLocale() {
+WebString RendererBlinkPlatformImpl::defaultLocale() {
   return base::ASCIIToUTF16(RenderThread::Get()->GetLocale());
 }
 
-void RendererWebKitPlatformSupportImpl::suddenTerminationChanged(bool enabled) {
+void RendererBlinkPlatformImpl::suddenTerminationChanged(bool enabled) {
   if (enabled) {
     // We should not get more enables than disables, but we want it to be a
     // non-fatal error if it does happen.
@@ -370,28 +364,27 @@ void RendererWebKitPlatformSupportImpl::suddenTerminationChanged(bool enabled) {
     thread->Send(new ViewHostMsg_SuddenTerminationChanged(enabled));
 }
 
-WebStorageNamespace*
-RendererWebKitPlatformSupportImpl::createLocalStorageNamespace() {
+WebStorageNamespace* RendererBlinkPlatformImpl::createLocalStorageNamespace() {
   return new WebStorageNamespaceImpl();
 }
 
 
 //------------------------------------------------------------------------------
 
-WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() {
+WebIDBFactory* RendererBlinkPlatformImpl::idbFactory() {
   return web_idb_factory_.get();
 }
 
 //------------------------------------------------------------------------------
 
-WebFileSystem* RendererWebKitPlatformSupportImpl::fileSystem() {
+WebFileSystem* RendererBlinkPlatformImpl::fileSystem() {
   return WebFileSystemImpl::ThreadSpecificInstance(child_thread_loop_.get());
 }
 
 //------------------------------------------------------------------------------
 
 WebMimeRegistry::SupportsType
-RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType(
+RendererBlinkPlatformImpl::MimeRegistry::supportsMediaMIMEType(
     const WebString& mime_type,
     const WebString& codecs,
     const WebString& key_system) {
@@ -439,8 +432,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType(
   return IsSupported;
 }
 
-bool
-RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaSourceMIMEType(
+bool RendererBlinkPlatformImpl::MimeRegistry::supportsMediaSourceMIMEType(
     const blink::WebString& mime_type,
     const WebString& codecs) {
   const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type);
@@ -452,8 +444,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaSourceMIMEType(
       mime_type_ascii, parsed_codec_ids);
 }
 
-bool
-RendererWebKitPlatformSupportImpl::MimeRegistry::supportsEncryptedMediaMIMEType(
+bool RendererBlinkPlatformImpl::MimeRegistry::supportsEncryptedMediaMIMEType(
     const WebString& key_system,
     const WebString& mime_type,
     const WebString& codecs) {
@@ -477,8 +468,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::supportsEncryptedMediaMIMEType(
       mime_type_ascii, codec_vector, base::UTF16ToASCII(key_system));
 }
 
-WebString
-RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension(
+WebString RendererBlinkPlatformImpl::MimeRegistry::mimeTypeForExtension(
     const WebString& file_extension) {
   if (IsPluginProcess())
     return SimpleWebMimeRegistryImpl::mimeTypeForExtension(file_extension);
@@ -492,7 +482,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension(
   return base::ASCIIToUTF16(mime_type);
 }
 
-WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
+WebString RendererBlinkPlatformImpl::MimeRegistry::mimeTypeFromFile(
     const WebString& file_path) {
   if (IsPluginProcess())
     return SimpleWebMimeRegistryImpl::mimeTypeFromFile(file_path);
@@ -508,7 +498,7 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
 
 //------------------------------------------------------------------------------
 
-bool RendererWebKitPlatformSupportImpl::FileUtilities::getFileInfo(
+bool RendererBlinkPlatformImpl::FileUtilities::getFileInfo(
     const WebString& path,
     WebFileInfo& web_file_info) {
   base::File::Info file_info;
@@ -523,8 +513,8 @@ bool RendererWebKitPlatformSupportImpl::FileUtilities::getFileInfo(
   return true;
 }
 
-bool RendererWebKitPlatformSupportImpl::FileUtilities::
-SendSyncMessageFromAnyThread(IPC::SyncMessage* msg) const {
+bool RendererBlinkPlatformImpl::FileUtilities::SendSyncMessageFromAnyThread(
+    IPC::SyncMessage* msg) const {
   base::TimeTicks begin = base::TimeTicks::Now();
   const bool success = thread_safe_sender_->Send(msg);
   base::TimeDelta delta = base::TimeTicks::Now() - begin;
@@ -536,8 +526,7 @@ SendSyncMessageFromAnyThread(IPC::SyncMessage* msg) const {
 
 #if defined(OS_WIN)
 
-bool RendererWebKitPlatformSupportImpl::SandboxSupport::ensureFontLoaded(
-    HFONT font) {
+bool RendererBlinkPlatformImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
   RenderThread::Get()->PreCacheFont(logfont);
@@ -546,8 +535,9 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::ensureFontLoaded(
 
 #elif defined(OS_MACOSX)
 
-bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont(
-    NSFont* src_font, CGFontRef* out, uint32* font_id) {
+bool RendererBlinkPlatformImpl::SandboxSupport::loadFont(NSFont* src_font,
+                                                         CGFontRef* out,
+                                                         uint32* font_id) {
   uint32 font_data_size;
   FontDescriptor src_font_descriptor(src_font);
   base::SharedMemoryHandle font_data;
@@ -582,8 +572,7 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont(
 
 #elif defined(OS_POSIX)
 
-void
-RendererWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
+void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
     blink::WebUChar32 character,
     const char* preferred_locale,
     blink::WebFallbackFont* fallbackFont) {
@@ -604,9 +593,10 @@ RendererWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
   unicode_font_families_.insert(std::make_pair(character, *fallbackFont));
 }
 
-void
-RendererWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
-    const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out) {
+void RendererBlinkPlatformImpl::SandboxSupport::getRenderStyleForStrike(
+    const char* family,
+    int sizeAndStyle,
+    blink::WebFontRenderStyle* out) {
   GetRenderStyleForStrike(family, sizeAndStyle, out);
 }
 
@@ -614,38 +604,39 @@ RendererWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
 
 //------------------------------------------------------------------------------
 
-Platform::FileHandle
-RendererWebKitPlatformSupportImpl::databaseOpenFile(
-    const WebString& vfs_file_name, int desired_flags) {
+Platform::FileHandle RendererBlinkPlatformImpl::databaseOpenFile(
+    const WebString& vfs_file_name,
+    int desired_flags) {
   return DatabaseUtil::DatabaseOpenFile(
       vfs_file_name, desired_flags, sync_message_filter_.get());
 }
 
-int RendererWebKitPlatformSupportImpl::databaseDeleteFile(
-    const WebString& vfs_file_name, bool sync_dir) {
+int RendererBlinkPlatformImpl::databaseDeleteFile(
+    const WebString& vfs_file_name,
+    bool sync_dir) {
   return DatabaseUtil::DatabaseDeleteFile(
       vfs_file_name, sync_dir, sync_message_filter_.get());
 }
 
-long RendererWebKitPlatformSupportImpl::databaseGetFileAttributes(
+long RendererBlinkPlatformImpl::databaseGetFileAttributes(
     const WebString& vfs_file_name) {
   return DatabaseUtil::DatabaseGetFileAttributes(vfs_file_name,
                                                  sync_message_filter_.get());
 }
 
-long long RendererWebKitPlatformSupportImpl::databaseGetFileSize(
+long long RendererBlinkPlatformImpl::databaseGetFileSize(
     const WebString& vfs_file_name) {
   return DatabaseUtil::DatabaseGetFileSize(vfs_file_name,
                                            sync_message_filter_.get());
 }
 
-long long RendererWebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin(
+long long RendererBlinkPlatformImpl::databaseGetSpaceAvailableForOrigin(
     const WebString& origin_identifier) {
   return DatabaseUtil::DatabaseGetSpaceAvailable(origin_identifier,
                                                  sync_message_filter_.get());
 }
 
-bool RendererWebKitPlatformSupportImpl::canAccelerate2dCanvas() {
+bool RendererBlinkPlatformImpl::canAccelerate2dCanvas() {
   RenderThreadImpl* thread = RenderThreadImpl::current();
   GpuChannelHost* host = thread->EstablishGpuChannelSync(
       CAUSE_FOR_GPU_LAUNCH_CANVAS_2D);
@@ -655,33 +646,32 @@ bool RendererWebKitPlatformSupportImpl::canAccelerate2dCanvas() {
   return host->gpu_info().SupportsAccelerated2dCanvas();
 }
 
-bool RendererWebKitPlatformSupportImpl::isThreadedCompositingEnabled() {
+bool RendererBlinkPlatformImpl::isThreadedCompositingEnabled() {
   RenderThreadImpl* thread = RenderThreadImpl::current();
   // thread can be NULL in tests.
   return thread && thread->compositor_message_loop_proxy().get();
 }
 
-double RendererWebKitPlatformSupportImpl::audioHardwareSampleRate() {
+double RendererBlinkPlatformImpl::audioHardwareSampleRate() {
   RenderThreadImpl* thread = RenderThreadImpl::current();
   return thread->GetAudioHardwareConfig()->GetOutputSampleRate();
 }
 
-size_t RendererWebKitPlatformSupportImpl::audioHardwareBufferSize() {
+size_t RendererBlinkPlatformImpl::audioHardwareBufferSize() {
   RenderThreadImpl* thread = RenderThreadImpl::current();
   return thread->GetAudioHardwareConfig()->GetOutputBufferSize();
 }
 
-unsigned RendererWebKitPlatformSupportImpl::audioHardwareOutputChannels() {
+unsigned RendererBlinkPlatformImpl::audioHardwareOutputChannels() {
   RenderThreadImpl* thread = RenderThreadImpl::current();
   return thread->GetAudioHardwareConfig()->GetOutputChannels();
 }
 
-WebDatabaseObserver* RendererWebKitPlatformSupportImpl::databaseObserver() {
+WebDatabaseObserver* RendererBlinkPlatformImpl::databaseObserver() {
   return web_database_observer_impl_.get();
 }
 
-WebAudioDevice*
-RendererWebKitPlatformSupportImpl::createAudioDevice(
+WebAudioDevice* RendererBlinkPlatformImpl::createAudioDevice(
     size_t buffer_size,
     unsigned input_channels,
     unsigned channels,
@@ -747,8 +737,9 @@ RendererWebKitPlatformSupportImpl::createAudioDevice(
 }
 
 #if defined(OS_ANDROID)
-bool RendererWebKitPlatformSupportImpl::loadAudioResource(
-    blink::WebAudioBus* destination_bus, const char* audio_file_data,
+bool RendererBlinkPlatformImpl::loadAudioResource(
+    blink::WebAudioBus* destination_bus,
+    const char* audio_file_data,
     size_t data_size) {
   return DecodeAudioFileData(destination_bus,
                              audio_file_data,
@@ -756,8 +747,9 @@ bool RendererWebKitPlatformSupportImpl::loadAudioResource(
                              thread_safe_sender_);
 }
 #else
-bool RendererWebKitPlatformSupportImpl::loadAudioResource(
-    blink::WebAudioBus* destination_bus, const char* audio_file_data,
+bool RendererBlinkPlatformImpl::loadAudioResource(
+    blink::WebAudioBus* destination_bus,
+    const char* audio_file_data,
     size_t data_size) {
   return DecodeAudioFileData(
       destination_bus, audio_file_data, data_size);
@@ -766,8 +758,7 @@ bool RendererWebKitPlatformSupportImpl::loadAudioResource(
 
 //------------------------------------------------------------------------------
 
-blink::WebMIDIAccessor*
-RendererWebKitPlatformSupportImpl::createMIDIAccessor(
+blink::WebMIDIAccessor* RendererBlinkPlatformImpl::createMIDIAccessor(
     blink::WebMIDIAccessorClient* client) {
   blink::WebMIDIAccessor* accessor =
       GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client);
@@ -777,7 +768,7 @@ RendererWebKitPlatformSupportImpl::createMIDIAccessor(
   return new RendererWebMIDIAccessorImpl(client);
 }
 
-void RendererWebKitPlatformSupportImpl::getPluginList(
+void RendererBlinkPlatformImpl::getPluginList(
     bool refresh,
     blink::WebPluginListBuilder* builder) {
 #if defined(ENABLE_PLUGINS)
@@ -810,15 +801,13 @@ void RendererWebKitPlatformSupportImpl::getPluginList(
 
 //------------------------------------------------------------------------------
 
-blink::WebPublicSuffixList*
-RendererWebKitPlatformSupportImpl::publicSuffixList() {
+blink::WebPublicSuffixList* RendererBlinkPlatformImpl::publicSuffixList() {
   return &public_suffix_list_;
 }
 
 //------------------------------------------------------------------------------
 
-blink::WebString
-RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
+blink::WebString RendererBlinkPlatformImpl::signedPublicKeyAndChallengeString(
     unsigned key_size_index,
     const blink::WebString& challenge,
     const blink::WebURL& url) {
@@ -833,7 +822,7 @@ RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
 
 //------------------------------------------------------------------------------
 
-void RendererWebKitPlatformSupportImpl::screenColorProfile(
+void RendererBlinkPlatformImpl::screenColorProfile(
     WebVector<char>* to_profile) {
 #if defined(OS_WIN)
   // On Windows screen color profile is only available in the browser.
@@ -854,21 +843,20 @@ void RendererWebKitPlatformSupportImpl::screenColorProfile(
 
 //------------------------------------------------------------------------------
 
-blink::WebScrollbarBehavior*
-    RendererWebKitPlatformSupportImpl::scrollbarBehavior() {
+blink::WebScrollbarBehavior* RendererBlinkPlatformImpl::scrollbarBehavior() {
   return web_scrollbar_behavior_.get();
 }
 
 //------------------------------------------------------------------------------
 
-WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() {
+WebBlobRegistry* RendererBlinkPlatformImpl::blobRegistry() {
   // blob_registry_ can be NULL when running some tests.
   return blob_registry_.get();
 }
 
 //------------------------------------------------------------------------------
 
-void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) {
+void RendererBlinkPlatformImpl::sampleGamepads(WebGamepads& gamepads) {
   PlatformEventObserverBase* observer =
       platform_event_observers_.Lookup(blink::WebPlatformEventGamepad);
   if (!observer)
@@ -879,7 +867,7 @@ void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) {
 //------------------------------------------------------------------------------
 
 WebRTCPeerConnectionHandler*
-RendererWebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
+RendererBlinkPlatformImpl::createRTCPeerConnectionHandler(
     WebRTCPeerConnectionHandlerClient* client) {
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   DCHECK(render_thread);
@@ -903,8 +891,7 @@ RendererWebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
 
 //------------------------------------------------------------------------------
 
-WebMediaStreamCenter*
-RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
+WebMediaStreamCenter* RendererBlinkPlatformImpl::createMediaStreamCenter(
     WebMediaStreamCenterClient* client) {
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   DCHECK(render_thread);
@@ -914,8 +901,7 @@ RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
 }
 
 // static
-bool RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(
-    bool enable) {
+bool RendererBlinkPlatformImpl::SetSandboxEnabledForTesting(bool enable) {
   bool was_enabled = g_sandbox_enabled;
   g_sandbox_enabled = enable;
   return was_enabled;
@@ -923,16 +909,16 @@ bool RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(
 
 //------------------------------------------------------------------------------
 
-blink::WebSpeechSynthesizer*
-RendererWebKitPlatformSupportImpl::createSpeechSynthesizer(
+blink::WebSpeechSynthesizer* RendererBlinkPlatformImpl::createSpeechSynthesizer(
     blink::WebSpeechSynthesizerClient* client) {
   return GetContentClient()->renderer()->OverrideSpeechSynthesizer(client);
 }
 
 //------------------------------------------------------------------------------
 
-bool RendererWebKitPlatformSupportImpl::processMemorySizesInBytes(
-    size_t* private_bytes, size_t* shared_bytes) {
+bool RendererBlinkPlatformImpl::processMemorySizesInBytes(
+    size_t* private_bytes,
+    size_t* shared_bytes) {
   content::RenderThread::Get()->Send(
       new ViewHostMsg_GetProcessMemorySizes(private_bytes, shared_bytes));
   return true;
@@ -941,13 +927,13 @@ bool RendererWebKitPlatformSupportImpl::processMemorySizesInBytes(
 //------------------------------------------------------------------------------
 
 blink::WebGraphicsContext3D*
-RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
+RendererBlinkPlatformImpl::createOffscreenGraphicsContext3D(
     const blink::WebGraphicsContext3D::Attributes& attributes) {
   return createOffscreenGraphicsContext3D(attributes, NULL);
 }
 
 blink::WebGraphicsContext3D*
-RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
+RendererBlinkPlatformImpl::createOffscreenGraphicsContext3D(
     const blink::WebGraphicsContext3D::Attributes& attributes,
     blink::WebGraphicsContext3D* share_context) {
   if (!RenderThreadImpl::current())
@@ -990,8 +976,8 @@ RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
 
 //------------------------------------------------------------------------------
 
-blink::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
-    createSharedOffscreenGraphicsContext3DProvider() {
+blink::WebGraphicsContext3DProvider*
+RendererBlinkPlatformImpl::createSharedOffscreenGraphicsContext3DProvider() {
   scoped_refptr<webkit::gpu::ContextProviderWebContext> provider =
       RenderThreadImpl::current()->SharedMainThreadContextProvider();
   if (!provider.get())
@@ -1001,14 +987,13 @@ blink::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
 
 //------------------------------------------------------------------------------
 
-blink::WebCompositorSupport*
-RendererWebKitPlatformSupportImpl::compositorSupport() {
+blink::WebCompositorSupport* RendererBlinkPlatformImpl::compositorSupport() {
   return &compositor_support_;
 }
 
 //------------------------------------------------------------------------------
 
-blink::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode(
+blink::WebString RendererBlinkPlatformImpl::convertIDNToUnicode(
     const blink::WebString& host,
     const blink::WebString& languages) {
   return net::IDNToUnicode(host.utf8(), languages.utf8());
@@ -1017,15 +1002,14 @@ blink::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode(
 //------------------------------------------------------------------------------
 
 // static
-void RendererWebKitPlatformSupportImpl::SetMockDeviceLightDataForTesting(
-    double data) {
+void RendererBlinkPlatformImpl::SetMockDeviceLightDataForTesting(double data) {
   g_test_device_light_data = data;
 }
 
 //------------------------------------------------------------------------------
 
 // static
-void RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting(
+void RendererBlinkPlatformImpl::SetMockDeviceMotionDataForTesting(
     const blink::WebDeviceMotionData& data) {
   g_test_device_motion_data.Get() = data;
 }
@@ -1033,19 +1017,19 @@ void RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting(
 //------------------------------------------------------------------------------
 
 // static
-void RendererWebKitPlatformSupportImpl::SetMockDeviceOrientationDataForTesting(
+void RendererBlinkPlatformImpl::SetMockDeviceOrientationDataForTesting(
     const blink::WebDeviceOrientationData& data) {
   g_test_device_orientation_data.Get() = data;
 }
 
 //------------------------------------------------------------------------------
 
-void RendererWebKitPlatformSupportImpl::vibrate(unsigned int milliseconds) {
+void RendererBlinkPlatformImpl::vibrate(unsigned int milliseconds) {
   RenderThread::Get()->Send(
       new ViewHostMsg_Vibrate(base::checked_cast<int64>(milliseconds)));
 }
 
-void RendererWebKitPlatformSupportImpl::cancelVibration() {
+void RendererBlinkPlatformImpl::cancelVibration() {
   RenderThread::Get()->Send(new ViewHostMsg_CancelVibration());
 }
 
@@ -1053,7 +1037,7 @@ void RendererWebKitPlatformSupportImpl::cancelVibration() {
 
 // static
 PlatformEventObserverBase*
-RendererWebKitPlatformSupportImpl::CreatePlatformEventObserverFromType(
+RendererBlinkPlatformImpl::CreatePlatformEventObserverFromType(
     blink::WebPlatformEventType type) {
   RenderThread* thread = RenderThreadImpl::current();
 
@@ -1084,14 +1068,14 @@ RendererWebKitPlatformSupportImpl::CreatePlatformEventObserverFromType(
   default:
     // A default statement is required to prevent compilation errors when Blink
     // adds a new type.
-    VLOG(1) << "RendererWebKitPlatformSupportImpl::startListening() with "
+    VLOG(1) << "RendererBlinkPlatformImpl::startListening() with "
                "unknown type.";
   }
 
   return 0;
 }
 
-void RendererWebKitPlatformSupportImpl::SetPlatformEventObserverForTesting(
+void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
     blink::WebPlatformEventType type,
     scoped_ptr<PlatformEventObserverBase> observer) {
   if (platform_event_observers_.Lookup(type))
@@ -1099,7 +1083,7 @@ void RendererWebKitPlatformSupportImpl::SetPlatformEventObserverForTesting(
   platform_event_observers_.AddWithID(observer.release(), type);
 }
 
-void RendererWebKitPlatformSupportImpl::startListening(
+void RendererBlinkPlatformImpl::startListening(
     blink::WebPlatformEventType type,
     blink::WebPlatformEventListener* listener) {
   PlatformEventObserverBase* observer = platform_event_observers_.Lookup(type);
@@ -1124,7 +1108,7 @@ void RendererWebKitPlatformSupportImpl::startListening(
   }
 }
 
-void RendererWebKitPlatformSupportImpl::SendFakeDeviceEventDataForTesting(
+void RendererBlinkPlatformImpl::SendFakeDeviceEventDataForTesting(
     blink::WebPlatformEventType type) {
   PlatformEventObserverBase* observer = platform_event_observers_.Lookup(type);
   CHECK(observer);
@@ -1158,7 +1142,7 @@ void RendererWebKitPlatformSupportImpl::SendFakeDeviceEventDataForTesting(
                  base::Unretained(observer), data));
 }
 
-void RendererWebKitPlatformSupportImpl::stopListening(
+void RendererBlinkPlatformImpl::stopListening(
     blink::WebPlatformEventType type) {
   PlatformEventObserverBase* observer = platform_event_observers_.Lookup(type);
   if (!observer)
@@ -1168,7 +1152,7 @@ void RendererWebKitPlatformSupportImpl::stopListening(
 
 //------------------------------------------------------------------------------
 
-void RendererWebKitPlatformSupportImpl::queryStorageUsageAndQuota(
+void RendererBlinkPlatformImpl::queryStorageUsageAndQuota(
     const blink::WebURL& storage_partition,
     blink::WebStorageQuotaType type,
     blink::WebStorageQuotaCallbacks callbacks) {
@@ -1184,7 +1168,7 @@ void RendererWebKitPlatformSupportImpl::queryStorageUsageAndQuota(
 
 //------------------------------------------------------------------------------
 
-void RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(
+void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
     const blink::WebBatteryStatus& status) {
   PlatformEventObserverBase* observer =
       platform_event_observers_.Lookup(blink::WebPlatformEventBattery);
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_blink_platform_impl.h
index 462186c..9d881bf 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
@@ -49,11 +49,10 @@ class WebClipboardImpl;
 class WebDatabaseObserverImpl;
 class WebFileSystemImpl;
 
-class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
-    : public BlinkPlatformImpl {
+class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
  public:
-  RendererWebKitPlatformSupportImpl();
-  virtual ~RendererWebKitPlatformSupportImpl();
+  RendererBlinkPlatformImpl();
+  virtual ~RendererBlinkPlatformImpl();
 
   void set_plugin_refresh_allowed(bool plugin_refresh_allowed) {
     plugin_refresh_allowed_ = plugin_refresh_allowed;
@@ -240,9 +239,9 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
 
   IDMap<PlatformEventObserverBase, IDMapOwnPointer> platform_event_observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(RendererWebKitPlatformSupportImpl);
+  DISALLOW_COPY_AND_ASSIGN(RendererBlinkPlatformImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
diff --git a/content/test/blink_test_environment.cc b/content/test/blink_test_environment.cc
index 94f9b47..b9655fe 100644
--- a/content/test/blink_test_environment.cc
+++ b/content/test/blink_test_environment.cc
@@ -14,7 +14,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
 #include "content/public/test/test_content_client_initializer.h"
-#include "content/test/test_webkit_platform_support.h"
+#include "content/test/test_blink_web_unit_test_support.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
@@ -63,21 +63,21 @@ class TestEnvironment {
   TestEnvironment() {
     main_message_loop_.reset(new MessageLoopType);
 
-    // TestWebKitPlatformSupport must be instantiated after MessageLoopType.
-    webkit_platform_support_.reset(new TestWebKitPlatformSupport);
+    // TestBlinkWebUnitTestSupport must be instantiated after MessageLoopType.
+    blink_test_support_.reset(new TestBlinkWebUnitTestSupport);
     content_initializer_.reset(new content::TestContentClientInitializer());
   }
 
   ~TestEnvironment() {
   }
 
-  TestWebKitPlatformSupport* webkit_platform_support() const {
-    return webkit_platform_support_.get();
+  TestBlinkWebUnitTestSupport* blink_platform_impl() const {
+    return blink_test_support_.get();
   }
 
  private:
   scoped_ptr<MessageLoopType> main_message_loop_;
-  scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
+  scoped_ptr<TestBlinkWebUnitTestSupport> blink_test_support_;
   scoped_ptr<TestContentClientInitializer> content_initializer_;
 };
 
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index 776ad69..a98a2da 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -17,7 +17,7 @@
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 #include "content/shell/renderer/test_runner/test_common.h"
 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h"
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
@@ -109,28 +109,29 @@ void FetchManifest(blink::WebView* view, const GURL& url,
 }
 
 void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) {
-  RenderThreadImpl::current()->webkit_platform_support()->
-      SetPlatformEventObserverForTesting(
+  RenderThreadImpl::current()
+      ->blink_platform_impl()
+      ->SetPlatformEventObserverForTesting(
           blink::WebPlatformEventGamepad,
           provider.PassAs<PlatformEventObserverBase>());
 }
 
 void SetMockDeviceLightData(const double data) {
-  RendererWebKitPlatformSupportImpl::SetMockDeviceLightDataForTesting(data);
+  RendererBlinkPlatformImpl::SetMockDeviceLightDataForTesting(data);
 }
 
 void SetMockDeviceMotionData(const WebDeviceMotionData& data) {
-  RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting(data);
+  RendererBlinkPlatformImpl::SetMockDeviceMotionDataForTesting(data);
 }
 
 void SetMockDeviceOrientationData(const WebDeviceOrientationData& data) {
-  RendererWebKitPlatformSupportImpl::
-      SetMockDeviceOrientationDataForTesting(data);
+  RendererBlinkPlatformImpl::SetMockDeviceOrientationDataForTesting(data);
 }
 
 void MockBatteryStatusChanged(const WebBatteryStatus& status) {
-  RenderThreadImpl::current()->webkit_platform_support()->
-    MockBatteryStatusChangedForTesting(status);
+  RenderThreadImpl::current()
+      ->blink_platform_impl()
+      ->MockBatteryStatusChangedForTesting(status);
 }
 
 void EnableRendererLayoutTestMode() {
diff --git a/content/test/test_webkit_platform_support.cc b/content/test/test_blink_web_unit_test_support.cc
index 804c2d3..8f743ed 100644
--- a/content/test/test_webkit_platform_support.cc
+++ b/content/test/test_blink_web_unit_test_support.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/test/test_webkit_platform_support.h"
+#include "content/test/test_blink_web_unit_test_support.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -40,7 +40,7 @@
 
 namespace content {
 
-TestWebKitPlatformSupport::TestWebKitPlatformSupport() {
+TestBlinkWebUnitTestSupport::TestBlinkWebUnitTestSupport() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
@@ -105,7 +105,7 @@ TestWebKitPlatformSupport::TestWebKitPlatformSupport() {
   v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
 }
 
-TestWebKitPlatformSupport::~TestWebKitPlatformSupport() {
+TestBlinkWebUnitTestSupport::~TestBlinkWebUnitTestSupport() {
   url_loader_factory_.reset();
   mock_clipboard_.reset();
   blink::shutdown();
@@ -113,40 +113,40 @@ TestWebKitPlatformSupport::~TestWebKitPlatformSupport() {
   stats_table_.reset();
 }
 
-blink::WebBlobRegistry* TestWebKitPlatformSupport::blobRegistry() {
+blink::WebBlobRegistry* TestBlinkWebUnitTestSupport::blobRegistry() {
   return &blob_registry_;
 }
 
-blink::WebClipboard* TestWebKitPlatformSupport::clipboard() {
+blink::WebClipboard* TestBlinkWebUnitTestSupport::clipboard() {
   // Mock out clipboard calls so that tests don't mess
   // with each other's copies/pastes when running in parallel.
   return mock_clipboard_.get();
 }
 
-blink::WebFileUtilities* TestWebKitPlatformSupport::fileUtilities() {
+blink::WebFileUtilities* TestBlinkWebUnitTestSupport::fileUtilities() {
   return &file_utilities_;
 }
 
-blink::WebIDBFactory* TestWebKitPlatformSupport::idbFactory() {
+blink::WebIDBFactory* TestBlinkWebUnitTestSupport::idbFactory() {
   NOTREACHED() <<
       "IndexedDB cannot be tested with in-process harnesses.";
   return NULL;
 }
 
-blink::WebMimeRegistry* TestWebKitPlatformSupport::mimeRegistry() {
+blink::WebMimeRegistry* TestBlinkWebUnitTestSupport::mimeRegistry() {
   return &mime_registry_;
 }
 
-blink::WebURLLoader* TestWebKitPlatformSupport::createURLLoader() {
+blink::WebURLLoader* TestBlinkWebUnitTestSupport::createURLLoader() {
   return url_loader_factory_->CreateURLLoader(
       BlinkPlatformImpl::createURLLoader());
 }
 
-blink::WebString TestWebKitPlatformSupport::userAgent() {
+blink::WebString TestBlinkWebUnitTestSupport::userAgent() {
   return blink::WebString::fromUTF8("DumpRenderTree/0.0.0.0");
 }
 
-blink::WebData TestWebKitPlatformSupport::loadResource(const char* name) {
+blink::WebData TestBlinkWebUnitTestSupport::loadResource(const char* name) {
   if (!strcmp(name, "deleteButton")) {
     // Create a red 30x30 square.
     const char red_square[] =
@@ -166,7 +166,7 @@ blink::WebData TestWebKitPlatformSupport::loadResource(const char* name) {
   return BlinkPlatformImpl::loadResource(name);
 }
 
-blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
+blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name) {
   // Returns placeholder strings to check if they are correctly localized.
   switch (name) {
@@ -193,7 +193,7 @@ blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
   }
 }
 
-blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
+blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name,
     const blink::WebString& value) {
   if (name == blink::WebLocalizedString::ValidationRangeUnderflow)
@@ -205,7 +205,7 @@ blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
   return BlinkPlatformImpl::queryLocalizedString(name, value);
 }
 
-blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
+blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name,
     const blink::WebString& value1,
     const blink::WebString& value2) {
@@ -216,25 +216,26 @@ blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
   return BlinkPlatformImpl::queryLocalizedString(name, value1, value2);
 }
 
-blink::WebString TestWebKitPlatformSupport::defaultLocale() {
+blink::WebString TestBlinkWebUnitTestSupport::defaultLocale() {
   return base::ASCIIToUTF16("en-US");
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
-void TestWebKitPlatformSupport::SetThemeEngine(blink::WebThemeEngine* engine) {
+void TestBlinkWebUnitTestSupport::SetThemeEngine(
+    blink::WebThemeEngine* engine) {
   active_theme_engine_ = engine ? engine : BlinkPlatformImpl::themeEngine();
 }
 
-blink::WebThemeEngine* TestWebKitPlatformSupport::themeEngine() {
+blink::WebThemeEngine* TestBlinkWebUnitTestSupport::themeEngine() {
   return active_theme_engine_;
 }
 #endif
 
-blink::WebCompositorSupport* TestWebKitPlatformSupport::compositorSupport() {
+blink::WebCompositorSupport* TestBlinkWebUnitTestSupport::compositorSupport() {
   return &compositor_support_;
 }
 
-blink::WebGestureCurve* TestWebKitPlatformSupport::createFlingAnimationCurve(
+blink::WebGestureCurve* TestBlinkWebUnitTestSupport::createFlingAnimationCurve(
     blink::WebGestureDevice device_source,
     const blink::WebFloatPoint& velocity,
     const blink::WebSize& cumulative_scroll) {
@@ -242,37 +243,38 @@ blink::WebGestureCurve* TestWebKitPlatformSupport::createFlingAnimationCurve(
   return new WebGestureCurveMock(velocity, cumulative_scroll);
 }
 
-blink::WebUnitTestSupport* TestWebKitPlatformSupport::unitTestSupport() {
+blink::WebUnitTestSupport* TestBlinkWebUnitTestSupport::unitTestSupport() {
   return this;
 }
 
-void TestWebKitPlatformSupport::registerMockedURL(
+void TestBlinkWebUnitTestSupport::registerMockedURL(
     const blink::WebURL& url,
     const blink::WebURLResponse& response,
     const blink::WebString& file_path) {
   url_loader_factory_->RegisterURL(url, response, file_path);
 }
 
-void TestWebKitPlatformSupport::registerMockedErrorURL(
+void TestBlinkWebUnitTestSupport::registerMockedErrorURL(
     const blink::WebURL& url,
     const blink::WebURLResponse& response,
     const blink::WebURLError& error) {
   url_loader_factory_->RegisterErrorURL(url, response, error);
 }
 
-void TestWebKitPlatformSupport::unregisterMockedURL(const blink::WebURL& url) {
+void TestBlinkWebUnitTestSupport::unregisterMockedURL(
+    const blink::WebURL& url) {
   url_loader_factory_->UnregisterURL(url);
 }
 
-void TestWebKitPlatformSupport::unregisterAllMockedURLs() {
+void TestBlinkWebUnitTestSupport::unregisterAllMockedURLs() {
   url_loader_factory_->UnregisterAllURLs();
 }
 
-void TestWebKitPlatformSupport::serveAsynchronousMockedRequests() {
+void TestBlinkWebUnitTestSupport::serveAsynchronousMockedRequests() {
   url_loader_factory_->ServeAsynchronousRequests();
 }
 
-blink::WebString TestWebKitPlatformSupport::webKitRootDir() {
+blink::WebString TestBlinkWebUnitTestSupport::webKitRootDir() {
   base::FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
@@ -284,7 +286,7 @@ blink::WebString TestWebKitPlatformSupport::webKitRootDir() {
 }
 
 blink::WebLayerTreeView*
-TestWebKitPlatformSupport::createLayerTreeViewForTesting() {
+TestBlinkWebUnitTestSupport::createLayerTreeViewForTesting() {
   scoped_ptr<WebLayerTreeViewImplForTesting> view(
       new WebLayerTreeViewImplForTesting());
 
@@ -292,7 +294,7 @@ TestWebKitPlatformSupport::createLayerTreeViewForTesting() {
   return view.release();
 }
 
-blink::WebData TestWebKitPlatformSupport::readFromFile(
+blink::WebData TestBlinkWebUnitTestSupport::readFromFile(
     const blink::WebString& path) {
   base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path);
 
diff --git a/content/test/test_webkit_platform_support.h b/content/test/test_blink_web_unit_test_support.h
index 2bda542..cea6cf9 100644
--- a/content/test/test_webkit_platform_support.h
+++ b/content/test/test_blink_web_unit_test_support.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
-#define CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
+#ifndef CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
+#define CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
@@ -26,13 +26,13 @@ class WebLayerTreeView;
 
 namespace content {
 
-// An implementation of WebKitPlatformSupport for tests.
-class TestWebKitPlatformSupport
-    : public blink::WebUnitTestSupport,
-      public BlinkPlatformImpl {
+// An implementation of blink::WebUnitTestSupport and BlinkPlatformImpl for
+// tests.
+class TestBlinkWebUnitTestSupport : public blink::WebUnitTestSupport,
+                                    public BlinkPlatformImpl {
  public:
-  TestWebKitPlatformSupport();
-  virtual ~TestWebKitPlatformSupport();
+  TestBlinkWebUnitTestSupport();
+  virtual ~TestBlinkWebUnitTestSupport();
 
   virtual blink::WebBlobRegistry* blobRegistry();
   virtual blink::WebClipboard* clipboard();
@@ -103,9 +103,9 @@ class TestWebKitPlatformSupport
 #if defined(OS_WIN) || defined(OS_MACOSX)
   blink::WebThemeEngine* active_theme_engine_;
 #endif
-  DISALLOW_COPY_AND_ASSIGN(TestWebKitPlatformSupport);
+  DISALLOW_COPY_AND_ASSIGN(TestBlinkWebUnitTestSupport);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
+#endif  // CONTENT_TEST_TEST_BLINK_WEB_UNIT_TEST_SUPPORT_H_
diff --git a/content/test/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc
index b188384..5714a2f 100644
--- a/content/test/web_layer_tree_view_impl_for_testing.cc
+++ b/content/test/web_layer_tree_view_impl_for_testing.cc
@@ -14,7 +14,7 @@
 #include "cc/output/output_surface.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/trees/layer_tree_host.h"
-#include "content/test/test_webkit_platform_support.h"
+#include "content/test/test_blink_web_unit_test_support.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebLayer.h"
diff --git a/content/test/weburl_loader_mock_factory.h b/content/test/weburl_loader_mock_factory.h
index a51987bc..6455d19 100644
--- a/content/test/weburl_loader_mock_factory.h
+++ b/content/test/weburl_loader_mock_factory.h
@@ -31,7 +31,7 @@ class WebURLLoaderMockFactory {
   WebURLLoaderMockFactory();
   virtual ~WebURLLoaderMockFactory();
 
-  // Called by TestWebKitPlatformSupport to create a WebURLLoader.
+  // Called by TestBlinkWebUnitTestSupport to create a WebURLLoader.
   // Non-mocked request are forwarded to |default_loader| which should not be
   // NULL.
   virtual blink::WebURLLoader* CreateURLLoader(
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index d885d8c..32f9814 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -94,8 +94,8 @@ void UtilityThreadImpl::Init() {
     // we run the utility thread on separate thread. This means that if any code
     // needs WebKit initialized in the utility process, they need to have
     // another path to support single process mode.
-    webkit_platform_support_.reset(new BlinkPlatformImpl);
-    blink::initialize(webkit_platform_support_.get());
+    blink_platform_impl_.reset(new BlinkPlatformImpl);
+    blink::initialize(blink_platform_impl_.get());
   }
   GetContentClient()->utility()->UtilityThreadStarted();
 }
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h
index 229cd0a..079555a 100644
--- a/content/utility/utility_thread_impl.h
+++ b/content/utility/utility_thread_impl.h
@@ -58,7 +58,7 @@ class UtilityThreadImpl : public UtilityThread,
   // True if running in single process mode.
   bool single_process_;
 
-  scoped_ptr<BlinkPlatformImpl> webkit_platform_support_;
+  scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl);
 };