Move the rest of webkit/glue into content/child

One more step towards removing src/webkit/

BUG=265753
TEST=content_shell and content_unittests
R=jochen@chromium.org,jam@chromium.org
TBR=darin

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

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

35 files changed, 84 insertions, 304 deletions

diff --git a/build/all.gyp b/build/all.gyp
index d400e95..7616bb5 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -103,7 +103,6 @@
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
             '../tools/telemetry/telemetry.gyp:*',
             '../v8/tools/gyp/v8.gyp:*',
-            '../webkit/glue/webkit_glue.gyp:*',
             '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:*',
             '<(libjpeg_gyp_path):*',
           ],
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ed83b62..81071b2 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -638,7 +638,6 @@
             ['component=="shared_library"', {
               'dependencies': [
                 '../content/content.gyp:content_plugin',
-                '../webkit/glue/webkit_glue.gyp:glue',
               ],
               'xcode_settings': {
                 'LD_RUNPATH_SEARCH_PATHS': [
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 67268b4..16a8ae5 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -95,7 +95,6 @@
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '../webkit/glue/webkit_glue.gyp:glue',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
         '../webkit/webkit_resources.gyp:webkit_resources',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index b27992a..adc2525 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -1181,11 +1181,6 @@
             'browser/extensions/window_controller_list.cc',
           ],
         }],
-        ['chrome_multiple_dll!=1', {
-          'dependencies': [
-            '../webkit/glue/webkit_glue.gyp:glue',
-          ],
-        }],
         ['use_brlapi==1', {
           'sources!': [
             'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 02da63f..f7d1c447 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2695,11 +2695,6 @@
             '../printing/printing.gyp:printing',
           ],
         }],
-        ['OS!="ios" and chrome_multiple_dll!=1', {
-          'dependencies': [
-            '../webkit/glue/webkit_glue.gyp:glue',
-          ],
-        }],
         ['OS == "android"', {
           'dependencies': [
             '../third_party/openssl/openssl.gyp:openssl',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 9779e14..773a7de 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -460,11 +460,6 @@
             '<(DEPTH)/printing/printing.gyp:printing',
           ],
         }],
-        ['OS!="ios" and chrome_multiple_dll!=1', {
-          'dependencies': [
-            '<(DEPTH)/webkit/glue/webkit_glue.gyp:glue',
-          ],
-        }],
         ['OS=="android"', {
           'sources/': [
             ['exclude', '^common/chrome_version_info_posix.cc'],
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 59bffeb..b546cd6 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -34,7 +34,6 @@
         '../ui/surface/surface.gyp:surface',
         '../webkit/child/webkit_child.gyp:webkit_child',
         '../webkit/common/webkit_common.gyp:webkit_common',
-        '../webkit/glue/webkit_glue.gyp:glue',
         '../webkit/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cff91ed..e9475fa 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2882,7 +2882,6 @@
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../webkit/glue/webkit_glue.gyp:glue',
           ],
           'sources': [
             'test/perf/perftests.cc',
diff --git a/components/sessions.gypi b/components/sessions.gypi
index 099c88f..4d2805d 100644
--- a/components/sessions.gypi
+++ b/components/sessions.gypi
@@ -25,11 +25,6 @@
         'sessions/serialized_navigation_entry.h',
       ],
       'conditions': [
-        ['OS != "ios" and chrome_multiple_dll != 1', {
-          'dependencies': [
-            '../webkit/glue/webkit_glue.gyp:glue',
-          ]
-        }],
         ['android_webview_build == 0', {
           'dependencies': [
              '../sync/sync.gyp:sync',
diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi
index 4df0cc0..5506338 100644
--- a/components/web_contents_delegate_android.gypi
+++ b/components/web_contents_delegate_android.gypi
@@ -19,7 +19,6 @@
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/ui.gyp:ui',
-            '../webkit/glue/webkit_glue.gyp:glue',
             'web_contents_delegate_android_jni_headers',
           ],
           'include_dirs': [
diff --git a/webkit/glue/webkit_glue.cc b/content/child/blink_glue.cc
index 05e7bca..9a3af75 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/content/child/blink_glue.cc
@@ -1,17 +1,16 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/webkit_glue.h"
+#include "content/child/blink_glue.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 
-namespace webkit_glue {
+namespace content {
 
-void FileInfoToWebFileInfo(
-    const base::File::Info& file_info,
-    blink::WebFileInfo* web_file_info) {
+void FileInfoToWebFileInfo(const base::File::Info& file_info,
+                           blink::WebFileInfo* web_file_info) {
   DCHECK(web_file_info);
   // WebKit now expects NaN as uninitialized/null Date.
   if (file_info.last_modified.is_null())
@@ -27,4 +26,4 @@ void FileInfoToWebFileInfo(
 
 COMPILE_ASSERT(std::numeric_limits<double>::has_quiet_NaN, has_quiet_NaN);
 
-}  // namespace webkit_glue
+}  // namespace content
diff --git a/content/child/blink_glue.h b/content/child/blink_glue.h
new file mode 100644
index 0000000..0181472
--- /dev/null
+++ b/content/child/blink_glue.h
@@ -0,0 +1,23 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_CHILD_BLINK_GLUE_H_
+#define CONTENT_CHILD_BLINK_GLUE_H_
+
+#include "base/files/file.h"
+#include "content/common/content_export.h"
+
+namespace blink {
+struct WebFileInfo;
+}
+
+namespace content {
+
+// File info conversion
+CONTENT_EXPORT void FileInfoToWebFileInfo(const base::File::Info& file_info,
+                                          blink::WebFileInfo* web_file_info);
+
+}  // namespace content
+
+#endif  // CONTENT_CHILD_BLINK_GLUE_H_
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index 902c12d..a31055e 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -11,6 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_local.h"
+#include "content/child/blink_glue.h"
 #include "content/child/child_thread.h"
 #include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/child/fileapi/webfilewriter_impl.h"
@@ -23,7 +24,6 @@
 #include "webkit/child/worker_task_runner.h"
 #include "webkit/common/fileapi/directory_entry.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/glue/webkit_glue.h"
 
 using blink::WebFileInfo;
 using blink::WebFileSystemCallbacks;
@@ -188,7 +188,7 @@ void ReadMetadataCallbackAdapter(int thread_id, int callbacks_id,
                                  WaitableCallbackResults* waitable_results,
                                  const base::File::Info& file_info) {
   WebFileInfo web_file_info;
-  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
+  FileInfoToWebFileInfo(file_info, &web_file_info);
   CallbackFileSystemCallbacks(
       thread_id, callbacks_id, waitable_results,
       &WebFileSystemCallbacks::didReadMetadata,
@@ -265,7 +265,7 @@ void DidCreateSnapshotFile(
       filesystem->GetAndUnregisterCallbacks(callbacks_id);
 
   WebFileInfo web_file_info;
-  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
+  FileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = platform_path.AsUTF16Unsafe();
   callbacks.didCreateSnapshotFile(web_file_info);
 
diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/content/child/simple_webmimeregistry_impl.cc
index b6bdadc..2b135c1 100644
--- a/webkit/glue/simple_webmimeregistry_impl.cc
+++ b/content/child/simple_webmimeregistry_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/simple_webmimeregistry_impl.h"
+#include "content/child/simple_webmimeregistry_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
@@ -14,7 +14,7 @@
 using blink::WebString;
 using blink::WebMimeRegistry;
 
-namespace webkit_glue {
+namespace content {
 
 //static
 std::string SimpleWebMimeRegistryImpl::ToASCIIOrEmpty(const WebString& string) {
@@ -88,4 +88,4 @@ WebString SimpleWebMimeRegistryImpl::mimeTypeFromFile(
   return WebString::fromUTF8(mime_type);
 }
 
-}  // namespace webkit_glue
+}  // namespace content
diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/content/child/simple_webmimeregistry_impl.h
index 9d76550..b0246d0 100644
--- a/webkit/glue/simple_webmimeregistry_impl.h
+++ b/content/child/simple_webmimeregistry_impl.h
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
-#define WEBKIT_GLUE_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
+#ifndef CONTENT_CHILD_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
+#define CONTENT_CHILD_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebMimeRegistry.h"
-#include "webkit/glue/webkit_glue_export.h"
 
-namespace webkit_glue {
+namespace content {
 
-class WEBKIT_GLUE_EXPORT SimpleWebMimeRegistryImpl :
+class CONTENT_EXPORT SimpleWebMimeRegistryImpl :
     NON_EXPORTED_BASE(public blink::WebMimeRegistry) {
  public:
   SimpleWebMimeRegistryImpl() {}
@@ -44,6 +44,6 @@ class WEBKIT_GLUE_EXPORT SimpleWebMimeRegistryImpl :
   virtual blink::WebString mimeTypeFromFile(const blink::WebString&);
 };
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBKIT_GLUE_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
+#endif  // CONTENT_CHILD_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
diff --git a/webkit/glue/webfileutilities_impl.cc b/content/child/webfileutilities_impl.cc
index eca5326..9c05596 100644
--- a/webkit/glue/webfileutilities_impl.cc
+++ b/content/child/webfileutilities_impl.cc
@@ -1,22 +1,22 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/webfileutilities_impl.h"
+#include "content/child/webfileutilities_impl.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "content/child/blink_glue.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/glue/webkit_glue.h"
 
 using blink::WebString;
 
-namespace webkit_glue {
+namespace content {
 
 WebFileUtilitiesImpl::WebFileUtilitiesImpl()
     : sandbox_enabled_(true) {
@@ -37,7 +37,7 @@ bool WebFileUtilitiesImpl::getFileInfo(const WebString& path,
                          reinterpret_cast<base::File::Info*>(&file_info)))
     return false;
 
-  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
+  FileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = path;
   return true;
 }
@@ -84,4 +84,4 @@ int WebFileUtilitiesImpl::readFromFile(base::PlatformFile handle,
   return base::ReadPlatformFileCurPosNoBestEffort(handle, data, length);
 }
 
-}  // namespace webkit_glue
+}  // namespace content
diff --git a/webkit/glue/webfileutilities_impl.h b/content/child/webfileutilities_impl.h
index c4e0aac..c0119b6 100644
--- a/webkit/glue/webfileutilities_impl.h
+++ b/content/child/webfileutilities_impl.h
@@ -1,27 +1,26 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBFILEUTILITIES_IMPL_H_
-#define WEBFILEUTILITIES_IMPL_H_
+#ifndef CONTENT_CHILD_WEBFILEUTILITIES_IMPL_H_
+#define CONTENT_CHILD_WEBFILEUTILITIES_IMPL_H_
 
 #include "base/platform_file.h"
+#include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 #include "third_party/WebKit/public/platform/WebFileUtilities.h"
-#include "webkit/glue/webkit_glue_export.h"
 
-namespace webkit_glue {
+namespace content {
 
-class WEBKIT_GLUE_EXPORT WebFileUtilitiesImpl :
-    NON_EXPORTED_BASE(public blink::WebFileUtilities) {
+class CONTENT_EXPORT WebFileUtilitiesImpl
+    : NON_EXPORTED_BASE(public blink::WebFileUtilities) {
  public:
   WebFileUtilitiesImpl();
   virtual ~WebFileUtilitiesImpl();
 
   // WebFileUtilities methods:
-  virtual bool getFileInfo(
-      const blink::WebString& path,
-      blink::WebFileInfo& result);
+  virtual bool getFileInfo(const blink::WebString& path,
+                           blink::WebFileInfo& result);
   virtual blink::WebString directoryName(const blink::WebString& path);
   virtual blink::WebString baseName(const blink::WebString& path);
   virtual blink::WebURL filePathToURL(const blink::WebString& path);
@@ -37,6 +36,6 @@ class WEBKIT_GLUE_EXPORT WebFileUtilitiesImpl :
   bool sandbox_enabled_;
 };
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBFILEUTILITIES_IMPL_H_
+#endif  // CONTENT_CHILD_WEBFILEUTILITIES_IMPL_H_
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 81cd97c..22ccaa4 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -29,6 +29,8 @@
     'child/appcache/appcache_frontend_impl.h',
     'child/appcache/web_application_cache_host_impl.cc',
     'child/appcache/web_application_cache_host_impl.h',
+    'child/blink_glue.cc',
+    'child/blink_glue.h',
     'child/browser_font_resource_trusted.cc',
     'child/browser_font_resource_trusted.h',
     'child/child_histogram_message_filter.cc',
@@ -137,6 +139,8 @@
     'child/service_worker/web_service_worker_impl.h',
     'child/service_worker/web_service_worker_provider_impl.cc',
     'child/service_worker/web_service_worker_provider_impl.h',
+    'child/simple_webmimeregistry_impl.cc',
+    'child/simple_webmimeregistry_impl.h',
     'child/site_isolation_policy.cc',
     'child/site_isolation_policy.h',
     'child/socket_stream_dispatcher.cc',
@@ -149,10 +153,12 @@
     'child/web_discardable_memory_impl.h',
     'child/webblobregistry_impl.cc',
     'child/webblobregistry_impl.h',
-    'child/webkitplatformsupport_impl.cc',
-    'child/webkitplatformsupport_impl.h',
+    'child/webfileutilities_impl.cc',
+    'child/webfileutilities_impl.h',
     'child/webkitplatformsupport_child_impl.cc',
     'child/webkitplatformsupport_child_impl.h',
+    'child/webkitplatformsupport_impl.cc',
+    'child/webkitplatformsupport_impl.h',
     'child/webmessageportchannel_impl.cc',
     'child/webmessageportchannel_impl.h',
     'child/websocket_bridge.cc',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 3e5a8a6..750d799 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -391,8 +391,8 @@
     'common/url_schemes.cc',
     'common/url_schemes.h',
     'common/utility_messages.h',
-    'common/view_messages.h',
     'common/view_message_enums.h',
+    'common/view_messages.h',
     'common/webplugin_geometry.cc',
     'common/webplugin_geometry.h',
     'common/websocket.cc',
@@ -456,11 +456,6 @@
         '../webkit/storage_common.gyp:webkit_storage_common',
       ],
     }],
-    ['OS!="ios" and chrome_multiple_dll!=1', {
-      'dependencies': [
-        '../webkit/glue/webkit_glue.gyp:glue',
-      ],
-    }],
     ['OS=="mac"', {
       'sources': [
         'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 5ad3b80..09d8959 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -9,7 +9,6 @@
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/glue/webkit_glue.gyp:glue',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 55fc3b56..66df31b 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -23,7 +23,6 @@
     '../webkit/child/webkit_child.gyp:webkit_child',
     '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
     '../webkit/common/webkit_common.gyp:webkit_common',
-    '../webkit/glue/webkit_glue.gyp:glue',
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
     '../webkit/storage_common.gyp:webkit_storage_common',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index aa47b17..fb161d1 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -59,7 +59,6 @@
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/common/webkit_common.gyp:webkit_common',
-        '../webkit/glue/webkit_glue.gyp:glue',
         '../webkit/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index bb64aee..3849a1c 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -230,7 +230,6 @@
             '../webkit/child/webkit_child.gyp:webkit_child',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-            '../webkit/glue/webkit_glue.gyp:glue',
             '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
@@ -674,7 +673,6 @@
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/common/webkit_common.gyp:webkit_common',
-            '../webkit/glue/webkit_glue.gyp:glue',
             '../webkit/child/webkit_child.gyp:webkit_child',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
@@ -934,7 +932,6 @@
             '../ui/snapshot/snapshot.gyp:snapshot',
             '../ui/ui.gyp:ui',
             '../webkit/child/webkit_child.gyp:webkit_child',
-            '../webkit/glue/webkit_glue.gyp:glue',
           ],
           'include_dirs': [
             '..',
@@ -1184,7 +1181,6 @@
             # The following two dependencies provide the missing
             # symbol HeapProfilerStart in Linux component builds.
             '../webkit/child/webkit_child.gyp:webkit_child',
-            '../webkit/glue/webkit_glue.gyp:glue',
           ],
           'include_dirs': [
             '..',
@@ -1216,7 +1212,6 @@
             '../third_party/WebKit/public/blink.gyp:blink',
             # The following two dependencies provide the missing
             # symbol HeapProfilerStart in Linux component builds.
-            '../webkit/glue/webkit_glue.gyp:glue',
             '../webkit/child/webkit_child.gyp:webkit_child',
           ],
           'include_dirs': [
diff --git a/content/plugin/DEPS b/content/plugin/DEPS
index a87bacc..9fc12ed 100644
--- a/content/plugin/DEPS
+++ b/content/plugin/DEPS
@@ -5,6 +5,5 @@ include_rules = [
   "+sandbox/win/src",
   "+skia/ext",
   "+third_party/npapi",
-  "+webkit/glue",
 ]
 
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 1d3e471..85bdea3 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -14,15 +14,18 @@
 #include "base/platform_file.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/child/blink_glue.h"
 #include "content/child/database_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/webidbfactory_impl.h"
 #include "content/child/npapi/npobject_util.h"
 #include "content/child/quota_dispatcher.h"
 #include "content/child/quota_message_filter.h"
+#include "content/child/simple_webmimeregistry_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/web_database_observer_impl.h"
 #include "content/child/webblobregistry_impl.h"
+#include "content/child/webfileutilities_impl.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
@@ -73,9 +76,6 @@
 #include "url/gurl.h"
 #include "webkit/common/gpu/context_provider_web_context.h"
 #include "webkit/common/quota/quota_types.h"
-#include "webkit/glue/simple_webmimeregistry_impl.h"
-#include "webkit/glue/webfileutilities_impl.h"
-#include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "content/common/child_process_messages.h"
@@ -140,7 +140,7 @@ base::LazyInstance<blink::WebDeviceOrientationData>::Leaky
 //------------------------------------------------------------------------------
 
 class RendererWebKitPlatformSupportImpl::MimeRegistry
-    : public webkit_glue::SimpleWebMimeRegistryImpl {
+    : public SimpleWebMimeRegistryImpl {
  public:
   virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const blink::WebString& mime_type,
@@ -155,7 +155,7 @@ class RendererWebKitPlatformSupportImpl::MimeRegistry
 };
 
 class RendererWebKitPlatformSupportImpl::FileUtilities
-    : public webkit_glue::WebFileUtilitiesImpl {
+    : public WebFileUtilitiesImpl {
  public:
   explicit FileUtilities(ThreadSafeSender* sender)
       : thread_safe_sender_(sender) {}
@@ -486,7 +486,7 @@ bool RendererWebKitPlatformSupportImpl::FileUtilities::getFileInfo(
       status != base::File::FILE_OK) {
     return false;
   }
-  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
+  FileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = path;
   return true;
 }
diff --git a/content/test/test_webkit_platform_support.cc b/content/test/test_webkit_platform_support.cc
index f013d77..49f7c90 100644
--- a/content/test/test_webkit_platform_support.cc
+++ b/content/test/test_webkit_platform_support.cc
@@ -34,7 +34,6 @@
 #include "v8/include/v8.h"
 #include "webkit/browser/database/vfs_backend.h"
 #include "webkit/child/webkitplatformsupport_impl.h"
-#include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 
 #if defined(OS_WIN)
diff --git a/content/test/test_webkit_platform_support.h b/content/test/test_webkit_platform_support.h
index ae5880f..1dfb906 100644
--- a/content/test/test_webkit_platform_support.h
+++ b/content/test/test_webkit_platform_support.h
@@ -7,12 +7,12 @@
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
+#include "content/child/simple_webmimeregistry_impl.h"
+#include "content/child/webfileutilities_impl.h"
 #include "content/child/webkitplatformsupport_child_impl.h"
 #include "content/test/mock_webclipboard_impl.h"
 #include "content/test/weburl_loader_mock_factory.h"
 #include "third_party/WebKit/public/platform/WebUnitTestSupport.h"
-#include "webkit/glue/simple_webmimeregistry_impl.h"
-#include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 
 namespace blink {
@@ -97,9 +97,9 @@ class TestWebKitPlatformSupport
   virtual blink::WebData readFromFile(const blink::WebString& path);
 
  private:
-  webkit_glue::SimpleWebMimeRegistryImpl mime_registry_;
+  SimpleWebMimeRegistryImpl mime_registry_;
   scoped_ptr<MockWebClipboardImpl> mock_clipboard_;
-  webkit_glue::WebFileUtilitiesImpl file_utilities_;
+  WebFileUtilitiesImpl file_utilities_;
   base::ScopedTempDir file_system_root_;
   scoped_ptr<WebURLLoaderMockFactory> url_loader_factory_;
   webkit::WebCompositorSupportImpl compositor_support_;
diff --git a/content/utility/DEPS b/content/utility/DEPS
index f7630c38..0818b2c 100644
--- a/content/utility/DEPS
+++ b/content/utility/DEPS
@@ -2,5 +2,4 @@ include_rules = [
   "+content/child",
   "+content/public/utility",
   "+sandbox/win/src",
-  "+webkit/glue",
 ]
diff --git a/content/worker/DEPS b/content/worker/DEPS
index 619c5b7..6e9ea80 100644
--- a/content/worker/DEPS
+++ b/content/worker/DEPS
@@ -2,6 +2,5 @@ include_rules = [
   "+content/child",
   "+sandbox/win/src",
   "+v8/include/v8.h",
-  "+webkit/glue",
 ]
 
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index a83cd34..553f677 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/child/blink_glue.h"
 #include "content/child/database_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/webidbfactory_impl.h"
@@ -17,6 +18,7 @@
 #include "content/child/thread_safe_sender.h"
 #include "content/child/web_database_observer_impl.h"
 #include "content/child/webblobregistry_impl.h"
+#include "content/child/webfileutilities_impl.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
@@ -28,8 +30,6 @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "webkit/common/quota/quota_types.h"
-#include "webkit/glue/webfileutilities_impl.h"
-#include "webkit/glue/webkit_glue.h"
 
 using blink::Platform;
 using blink::WebBlobRegistry;
@@ -49,7 +49,7 @@ namespace content {
 // TODO(kinuko): Probably this could be consolidated into
 // RendererWebKitPlatformSupportImpl::FileUtilities.
 class WorkerWebKitPlatformSupportImpl::FileUtilities
-    : public webkit_glue::WebFileUtilitiesImpl {
+    : public WebFileUtilitiesImpl {
  public:
   explicit FileUtilities(ThreadSafeSender* sender)
       : thread_safe_sender_(sender) {}
@@ -69,7 +69,7 @@ bool WorkerWebKitPlatformSupportImpl::FileUtilities::getFileInfo(
       status != base::File::FILE_OK) {
     return false;
   }
-  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
+  FileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = path;
   return true;
 }
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index 201445c..ba121bc 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -259,7 +259,6 @@
             # symbol HeapProfilerStart in Linux component builds.
             # They probably can be removed after http://crbug.com/263316
             '../../webkit/child/webkit_child.gyp:webkit_child',
-            '../../webkit/glue/webkit_glue.gyp:glue',
           ],
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
diff --git a/webkit/glue/webkit_glue.gyp b/webkit/glue/webkit_glue.gyp
deleted file mode 100644
index 2b5c915..0000000
--- a/webkit/glue/webkit_glue.gyp
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'conditions': [
-    # TODO(stuartmorgan): All dependencies from code built on iOS to
-    # webkit/ should be removed, at which point this condition can be
-    # removed.
-    ['OS != "ios"', {
-      'includes': [
-        '../../build/win_precompile.gypi',
-        '../glue/webkit_glue.gypi',
-      ],
-    }],
-  ],
-}
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
deleted file mode 100644
index a4ad0a8..0000000
--- a/webkit/glue/webkit_glue.gypi
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'target_defaults': {
-     # Disable narrowing-conversion-in-initialization-list warnings in that we
-     # do not want to fix it in data file "webcursor_gtk_data.h".
-     'cflags+': ['-Wno-narrowing'],
-     'cflags_cc+': ['-Wno-narrowing'],
-  },
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'glue',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'defines': [
-        'WEBKIT_EXTENSIONS_IMPLEMENTATION',
-        'WEBKIT_GLUE_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/base.gyp:base_static',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
-        '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        '<(DEPTH)/ui/gl/gl.gyp:gl',
-        '<(DEPTH)/url/url.gyp:url_lib',
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
-        '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-        '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        '<(SHARED_INTERMEDIATE_DIR)/ui',
-      ],
-      'sources': [
-        'simple_webmimeregistry_impl.cc',
-        'simple_webmimeregistry_impl.h',
-        'webfileutilities_impl.cc',
-        'webfileutilities_impl.h',
-        'webkit_glue.cc',
-        'webkit_glue.h',
-        'webkit_glue_export.h',
-      ],
-      # When glue is a dependency, it needs to be a hard dependency.
-      # Dependents may rely on files generated by this target or one of its
-      # own hard dependencies.
-      'hard_dependency': 1,
-      'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-          'sources/': [['exclude', '_x11\\.cc$']],
-        }],
-        ['use_aura==1 and use_x11==1', {
-          'link_settings': {
-            'libraries': [ '-lXcursor', ],
-          },
-        }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4800, 4267 ],
-          'conditions': [
-            ['component=="shared_library"', {
-              'dependencies': [
-                 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-               ],
-               'export_dependent_settings': [
-                 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-               ],
-            }],
-          ],
-        }],
-        ['chrome_multiple_dll!=1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-          ],
-        }],
-        ['enable_printing!=0', {
-          'dependencies': [
-            '<(DEPTH)/printing/printing.gyp:printing',
-          ],
-        }],
-      ],
-    },
-  ],
-  'conditions': [
-    ['use_third_party_translations==1', {
-      'targets': [
-        {
-          'target_name': 'inspector_strings',
-          'type': 'none',
-          'variables': {
-            'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
-          },
-          'actions': [
-            {
-              'action_name': 'inspector_strings',
-              'variables': {
-                'grit_grd_file': 'inspector_strings.grd',
-              },
-              'includes': [ '../../build/grit_action.gypi' ],
-            },
-          ],
-          'includes': [ '../../build/grit_target.gypi' ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
deleted file mode 100644
index 0843bbf..0000000
--- a/webkit/glue/webkit_glue.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_GLUE_WEBKIT_GLUE_H_
-#define WEBKIT_GLUE_WEBKIT_GLUE_H_
-
-#include "base/files/file.h"
-#include "webkit/glue/webkit_glue_export.h"
-
-namespace blink {
-struct WebFileInfo;
-}
-
-namespace webkit_glue {
-
-// File info conversion
-WEBKIT_GLUE_EXPORT void FileInfoToWebFileInfo(
-    const base::File::Info& file_info,
-    blink::WebFileInfo* web_file_info);
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_WEBKIT_GLUE_H_
diff --git a/webkit/glue/webkit_glue_export.h b/webkit/glue/webkit_glue_export.h
deleted file mode 100644
index 0cbd365..0000000
--- a/webkit/glue/webkit_glue_export.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_
-#define WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(WEBKIT_GLUE_IMPLEMENTATION)
-#define WEBKIT_GLUE_EXPORT __declspec(dllexport)
-#else
-#define WEBKIT_GLUE_EXPORT __declspec(dllimport)
-#endif  // defined(WEBKIT_GLUE_IMPLEMENTATION)
-
-#else // defined(WIN32)
-#if defined(WEBKIT_GLUE_IMPLEMENTATION)
-#define WEBKIT_GLUE_EXPORT __attribute__((visibility("default")))
-#else
-#define WEBKIT_GLUE_EXPORT
-#endif
-#endif
-
-#else // defined(COMPONENT_BUILD)
-#define WEBKIT_GLUE_EXPORT
-#endif
-
-#endif  // WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_