Move webkitplatformsupport_impl and related from glue to child

Picking up Ananta's change.

Move the webkitplatformsupport_impl.cc/.h files out of webkit\glue to
webkit\child.

This requires moving the following files out of webkit\glue to webkit\child:
1. weburlloader_impl.cc/.h
2. weburlrequest_extradata_impl.cc/.h
3. websocketstreamhandle_impl.cc/.h
4. weburlresponse_extradata_impl.cc/.h
5. websocketstreamhandle_delegate.h
6. ftp_directory_listing_response_delegate.cc/.h
7. multipart_response_delegate.cc/.h
8. multipart_response_delegate_unittest.cc
9. resource_loader_bridge.cc/.h

The following files have been moved to webkit\common:
2. resource_type.cc/.h

Move MemoryUsageKB out of webkit_glue.cc/h to webkit/child/webkit_child_helpers.

I added an include rule to content\common\DEPS to allow including
webkit\child\websocketstreamhandle_delegate.h. This will be removed in a
followup.

TBR=jam@chromium.org, jamesr@chromium.org, jschuh@chromium.org

BUG=237249

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

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

39 files changed, 332 insertions, 286 deletions

diff --git a/webkit/browser/appcache/appcache_host.h b/webkit/browser/appcache/appcache_host.h
index fdc97d0..4242bc1 100644
--- a/webkit/browser/appcache/appcache_host.h
+++ b/webkit/browser/appcache/appcache_host.h
@@ -15,7 +15,7 @@
 #include "webkit/browser/appcache/appcache_storage.h"
 #include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
-#include "webkit/glue/resource_type.h"
+#include "webkit/common/resource_type.h"
 
 namespace net {
 class URLRequest;
diff --git a/webkit/browser/appcache/appcache_interceptor.h b/webkit/browser/appcache/appcache_interceptor.h
index 10ae84d..b1db1c0 100644
--- a/webkit/browser/appcache/appcache_interceptor.h
+++ b/webkit/browser/appcache/appcache_interceptor.h
@@ -9,7 +9,7 @@
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 #include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/glue/resource_type.h"
+#include "webkit/common/resource_type.h"
 
 namespace appcache {
 
diff --git a/webkit/browser/appcache/appcache_request_handler.h b/webkit/browser/appcache/appcache_request_handler.h
index 1b7753c..606d6cf 100644
--- a/webkit/browser/appcache/appcache_request_handler.h
+++ b/webkit/browser/appcache/appcache_request_handler.h
@@ -10,7 +10,7 @@
 #include "webkit/browser/appcache/appcache_entry.h"
 #include "webkit/browser/appcache/appcache_host.h"
 #include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/glue/resource_type.h"
+#include "webkit/common/resource_type.h"
 
 namespace net {
 class NetworkDelegate;
diff --git a/webkit/child/DEPS b/webkit/child/DEPS
index 552b168..64d1c38 100644
--- a/webkit/child/DEPS
+++ b/webkit/child/DEPS
@@ -1,5 +1,6 @@
-include_rules = [

-  "+jni",  # Needed for Android's java-generated bindings.

-  "+ui/base",

-  "+ui/native_theme",

-]

+include_rules = [
+  "+content/public/common",
+  "+jni",  # Needed for Android's java-generated bindings.
+  "+ui/base",
+  "+ui/native_theme",
+]
diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/child/ftp_directory_listing_response_delegate.cc
index 0629000..d84ada6 100644
--- a/webkit/glue/ftp_directory_listing_response_delegate.cc
+++ b/webkit/child/ftp_directory_listing_response_delegate.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 "webkit/glue/ftp_directory_listing_response_delegate.h"
+#include "webkit/child/ftp_directory_listing_response_delegate.h"
 
 #include <vector>
 
@@ -19,7 +19,7 @@
 #include "net/ftp/ftp_directory_listing_parser.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
-#include "webkit/glue/weburlresponse_extradata_impl.h"
+#include "webkit/child/weburlresponse_extradata_impl.h"
 
 using net::FtpDirectoryListingEntry;
 
diff --git a/webkit/glue/ftp_directory_listing_response_delegate.h b/webkit/child/ftp_directory_listing_response_delegate.h
index 0562049..efcbb21 100644
--- a/webkit/glue/ftp_directory_listing_response_delegate.h
+++ b/webkit/child/ftp_directory_listing_response_delegate.h
@@ -1,53 +1,53 @@
-// Copyright (c) 2011 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.
-//
-// A delegate class of WebURLLoaderImpl that handles text/vnd.chromium.ftp-dir
-// data.
-
-#ifndef WEBKIT_GLUE_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_
-#define WEBKIT_GLUE_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "third_party/WebKit/public/platform/WebURLResponse.h"
-
-namespace WebKit {
-class WebURLLoader;
-class WebURLLoaderClient;
-}
-
-class GURL;
-
-namespace webkit_glue {
-
-class FtpDirectoryListingResponseDelegate {
- public:
-  FtpDirectoryListingResponseDelegate(WebKit::WebURLLoaderClient* client,
-                                      WebKit::WebURLLoader* loader,
-                                      const WebKit::WebURLResponse& response);
-
-  // Passed through from ResourceHandleInternal
-  void OnReceivedData(const char* data, int data_len);
-  void OnCompletedRequest();
-
- private:
-  void Init(const GURL& response_url);
-
-  void SendDataToClient(const std::string& data);
-
-  // Pointers to the client and associated loader so we can make callbacks as
-  // we parse pieces of data.
-  WebKit::WebURLLoaderClient* client_;
-  WebKit::WebURLLoader* loader_;
-
-  // Buffer for data received from the network.
-  std::string buffer_;
-
-  DISALLOW_COPY_AND_ASSIGN(FtpDirectoryListingResponseDelegate);
-};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_
+// Copyright (c) 2011 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.

+//

+// A delegate class of WebURLLoaderImpl that handles text/vnd.chromium.ftp-dir

+// data.

+

+#ifndef WEBKIT_CHILD_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_

+#define WEBKIT_CHILD_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_

+

+#include <string>

+

+#include "base/basictypes.h"

+#include "third_party/WebKit/public/platform/WebURLResponse.h"

+

+namespace WebKit {

+class WebURLLoader;

+class WebURLLoaderClient;

+}

+

+class GURL;

+

+namespace webkit_glue {

+

+class FtpDirectoryListingResponseDelegate {

+ public:

+  FtpDirectoryListingResponseDelegate(WebKit::WebURLLoaderClient* client,

+                                      WebKit::WebURLLoader* loader,

+                                      const WebKit::WebURLResponse& response);

+

+  // Passed through from ResourceHandleInternal

+  void OnReceivedData(const char* data, int data_len);

+  void OnCompletedRequest();

+

+ private:

+  void Init(const GURL& response_url);

+

+  void SendDataToClient(const std::string& data);

+

+  // Pointers to the client and associated loader so we can make callbacks as

+  // we parse pieces of data.

+  WebKit::WebURLLoaderClient* client_;

+  WebKit::WebURLLoader* loader_;

+

+  // Buffer for data received from the network.

+  std::string buffer_;

+

+  DISALLOW_COPY_AND_ASSIGN(FtpDirectoryListingResponseDelegate);

+};

+

+}  // namespace webkit_glue

+

+#endif  // WEBKIT_CHILD_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_

diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/child/multipart_response_delegate.cc
index 325caf9..06af916 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/child/multipart_response_delegate.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 "webkit/glue/multipart_response_delegate.h"
+#include "webkit/child/multipart_response_delegate.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/child/multipart_response_delegate.h
index 6de1591..f85c1cf 100644
--- a/webkit/glue/multipart_response_delegate.h
+++ b/webkit/child/multipart_response_delegate.h
@@ -46,14 +46,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef WEBKIT_GLUE_MULTIPART_RESPONSE_DELEGATE_H_
-#define WEBKIT_GLUE_MULTIPART_RESPONSE_DELEGATE_H_
+#ifndef WEBKIT_CHILD_MULTIPART_RESPONSE_DELEGATE_H_
+#define WEBKIT_CHILD_MULTIPART_RESPONSE_DELEGATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/child/webkit_child_export.h"
 
 namespace WebKit {
 class WebURLLoader;
@@ -65,7 +65,7 @@ namespace webkit_glue {
 // Used by unit tests to access private members.
 class MultipartResponseDelegateTester;
 
-class WEBKIT_COMMON_EXPORT MultipartResponseDelegate {
+class WEBKIT_CHILD_EXPORT MultipartResponseDelegate {
  public:
   MultipartResponseDelegate(WebKit::WebURLLoaderClient* client,
                             WebKit::WebURLLoader* loader,
@@ -150,4 +150,4 @@ class WEBKIT_COMMON_EXPORT MultipartResponseDelegate {
 
 }  // namespace webkit_glue
 
-#endif
+#endif  // WEBKIT_CHILD_MULTIPART_RESPONSE_DELEGATE_H_
diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/child/multipart_response_delegate_unittest.cc
index 8e43d85..34ea209 100644
--- a/webkit/glue/multipart_response_delegate_unittest.cc
+++ b/webkit/child/multipart_response_delegate_unittest.cc
@@ -5,12 +5,12 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "webkit/glue/multipart_response_delegate.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/child/multipart_response_delegate.h"
 
 using std::string;
 using WebKit::WebString;
diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/child/resource_loader_bridge.cc
index 4d8eabe..077f557 100644
--- a/webkit/glue/resource_loader_bridge.cc
+++ b/webkit/child/resource_loader_bridge.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/child/resource_loader_bridge.h"
 
 #include "net/http/http_response_headers.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
+#include "webkit/common/resource_response_info.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h
index 3df3cc3..9d51b62 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/child/resource_loader_bridge.h
@@ -13,8 +13,8 @@
 // In turn, the bridge's owner on the WebKit end will implement the Peer
 // interface, which we will use to communicate notifications back.
 
-#ifndef WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_
-#define WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_
+#ifndef WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_
+#define WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_
 
 #include <utility>
 
@@ -29,9 +29,9 @@
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "url/gurl.h"
+#include "webkit/child/webkit_child_export.h"
 #include "webkit/common/resource_response_info.h"
-#include "webkit/glue/resource_type.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/resource_type.h"
 
 namespace webkit_glue {
 class ResourceRequestBody;
@@ -40,7 +40,7 @@ class ResourceLoaderBridge {
  public:
   // Structure used when calling
   // WebKitPlatformSupportImpl::CreateResourceLoader().
-  struct WEBKIT_GLUE_EXPORT RequestInfo {
+  struct WEBKIT_CHILD_EXPORT RequestInfo {
     RequestInfo();
     ~RequestInfo();
 
@@ -106,8 +106,8 @@ class ResourceLoaderBridge {
   // See the SyncLoad method declared below.  (The name of this struct is not
   // suffixed with "Info" because it also contains the response data.)
   struct SyncLoadResponse : ResourceResponseInfo {
-    SyncLoadResponse();
-    ~SyncLoadResponse();
+    WEBKIT_CHILD_EXPORT SyncLoadResponse();
+    WEBKIT_CHILD_EXPORT ~SyncLoadResponse();
 
     // The response error code.
     int error_code;
@@ -182,7 +182,7 @@ class ResourceLoaderBridge {
 
   // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but
   // anybody can delete at any time, INCLUDING during processing of callbacks.
-  WEBKIT_GLUE_EXPORT virtual ~ResourceLoaderBridge();
+  WEBKIT_CHILD_EXPORT virtual ~ResourceLoaderBridge();
 
   // Call this method before calling Start() to set the request body.
   // May only be used with HTTP(S) POST requests.
@@ -221,7 +221,7 @@ class ResourceLoaderBridge {
   // WebKitPlatformSupportImpl::CreateResourceLoader()
   // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload
   // methods may be called to construct the body of the request.
-  WEBKIT_GLUE_EXPORT ResourceLoaderBridge();
+  WEBKIT_CHILD_EXPORT ResourceLoaderBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge);
@@ -229,4 +229,4 @@ class ResourceLoaderBridge {
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_
+#endif  // WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_
diff --git a/webkit/child/webkit_child_helpers.cc b/webkit/child/webkit_child_helpers.cc
new file mode 100644
index 0000000..6777955
--- /dev/null
+++ b/webkit/child/webkit_child_helpers.cc
@@ -0,0 +1,53 @@
+// Copyright (c) 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.
+
+#include "webkit/child/webkit_child_helpers.h"
+
+#if defined(OS_LINUX)
+#include <malloc.h>
+#endif
+
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/process_util.h"
+#include "v8/include/v8.h"
+
+namespace webkit_glue {
+
+#if defined(OS_LINUX) || defined(OS_ANDROID)
+size_t MemoryUsageKB() {
+  struct mallinfo minfo = mallinfo();
+  uint64_t mem_usage =
+#if defined(USE_TCMALLOC)
+      minfo.uordblks
+#else
+      (minfo.hblkhd + minfo.arena)
+#endif
+      >> 10;
+
+  v8::HeapStatistics stat;
+  // TODO(svenpanne) The call below doesn't take web workers into account, this
+  // has to be done manually by iterating over all Isolates involved.
+  v8::Isolate::GetCurrent()->GetHeapStatistics(&stat);
+  return mem_usage + (static_cast<uint64_t>(stat.total_heap_size()) >> 10);
+}
+#elif defined(OS_MACOSX)
+size_t MemoryUsageKB() {
+  scoped_ptr<base::ProcessMetrics> process_metrics(
+      // The default port provider is sufficient to get data for the current
+      // process.
+      base::ProcessMetrics::CreateProcessMetrics(
+          base::GetCurrentProcessHandle(), NULL));
+  return process_metrics->GetWorkingSetSize() >> 10;
+}
+#else
+size_t MemoryUsageKB() {
+  scoped_ptr<base::ProcessMetrics> process_metrics(
+      base::ProcessMetrics::CreateProcessMetrics(
+          base::GetCurrentProcessHandle()));
+  return process_metrics->GetPagefileUsage() >> 10;
+}
+#endif
+
+}  // webkit_glue
diff --git a/webkit/child/webkit_child_helpers.h b/webkit/child/webkit_child_helpers.h
new file mode 100644
index 0000000..3262fa2
--- /dev/null
+++ b/webkit/child/webkit_child_helpers.h
@@ -0,0 +1,21 @@
+// Copyright (c) 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_CHILD_WEBKIT_CHILD_HELPERS_H_
+#define WEBKIT_CHILD_WEBKIT_CHILD_HELPERS_H_
+
+#include "base/basictypes.h"
+#include "webkit/child/webkit_child_export.h"
+
+namespace webkit_glue {
+
+// Returns an estimate of the memory usage of the renderer process. Different
+// platforms implement this function differently, and count in different
+// allocations. Results are not comparable across platforms. The estimate is
+// computed inside the sandbox and thus its not always accurate.
+WEBKIT_CHILD_EXPORT size_t MemoryUsageKB();
+
+}  // webkit_glue
+
+#endif  // WEBKIT_CHILD_WEBKIT_CHILD_HELPERS_H_
diff --git a/webkit/child/webkitplatformsupport_child_impl.h b/webkit/child/webkitplatformsupport_child_impl.h
index abb6338..5ba71d8 100644
--- a/webkit/child/webkitplatformsupport_child_impl.h
+++ b/webkit/child/webkitplatformsupport_child_impl.h
@@ -8,7 +8,7 @@
 #include "base/threading/thread_local_storage.h"
 #include "webkit/child/webfallbackthemeengine_impl.h"
 #include "webkit/child/webkit_child_export.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
 
 #if defined(USE_DEFAULT_RENDER_THEME)
 #include "webkit/child/webthemeengine_impl_default.h"
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc
index e592058..31a355e0 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/child/webkitplatformsupport_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 "webkit/glue/webkitplatformsupport_impl.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
 
 #include <math.h>
 
@@ -26,6 +26,7 @@
 #include "base/synchronization/lock.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
+#include "content/public/common/webplugininfo.h"
 #include "grit/webkit_chromium_resources.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
@@ -36,6 +37,7 @@
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebDiscardableMemory.h"
 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
+#include "third_party/WebKit/public/platform/WebPluginListBuilder.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
@@ -44,10 +46,11 @@
 #include "third_party/WebKit/public/web/WebScreenInfo.h"
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #include "ui/base/layout.h"
+#include "webkit/child/webkit_child_helpers.h"
+#include "webkit/child/websocketstreamhandle_impl.h"
+#include "webkit/child/weburlloader_impl.h"
 #include "webkit/common/user_agent/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/websocketstreamhandle_impl.h"
-#include "webkit/glue/weburlloader_impl.h"
 
 using WebKit::WebAudioBus;
 using WebKit::WebCookie;
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/child/webkitplatformsupport_impl.h
index 68fcb2a..e9077582 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/child/webkitplatformsupport_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 WEBKIT_PLATFORM_SUPPORT_IMPL_H_
-#define WEBKIT_PLATFORM_SUPPORT_IMPL_H_
+#ifndef WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
+#define WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
@@ -12,8 +12,8 @@
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "ui/base/layout.h"
-#include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/child/resource_loader_bridge.h"
+#include "webkit/child/webkit_child_export.h"
 
 namespace base {
 class MessageLoop;
@@ -28,7 +28,7 @@ namespace webkit_glue {
 class WebSocketStreamHandleDelegate;
 class WebSocketStreamHandleBridge;
 
-class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
+class WEBKIT_CHILD_EXPORT WebKitPlatformSupportImpl :
     NON_EXPORTED_BASE(public WebKit::Platform) {
  public:
   WebKitPlatformSupportImpl();
@@ -152,4 +152,4 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_PLATFORM_SUPPORT_IMPL_H_
+#endif  // WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
diff --git a/webkit/glue/websocketstreamhandle_delegate.h b/webkit/child/websocketstreamhandle_delegate.h
index 2d02329..ba0822e 100644
--- a/webkit/glue/websocketstreamhandle_delegate.h
+++ b/webkit/child/websocketstreamhandle_delegate.h
@@ -1,44 +1,44 @@
-// 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_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
-#define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
-
-#include "base/strings/string16.h"
-
-class GURL;
-
-namespace WebKit {
-class WebSocketStreamHandle;
-}
-
-namespace webkit_glue {
-
-class WebSocketStreamHandleDelegate {
- public:
-  WebSocketStreamHandleDelegate() {}
-
-  virtual void WillOpenStream(WebKit::WebSocketStreamHandle* handle,
-                              const GURL& url) {}
-  virtual void WillSendData(WebKit::WebSocketStreamHandle* handle,
-                            const char* data, int len) {}
-
-  virtual void DidOpenStream(WebKit::WebSocketStreamHandle* handle,
-                             int max_amount_send_allowed) {}
-  virtual void DidSendData(WebKit::WebSocketStreamHandle* handle,
-                           int amount_sent) {}
-  virtual void DidReceiveData(WebKit::WebSocketStreamHandle* handle,
-                              const char* data, int len) {}
-  virtual void DidClose(WebKit::WebSocketStreamHandle*) {}
-  virtual void DidFail(WebKit::WebSocketStreamHandle* handle,
-                       int error_code,
-                       const string16& error_msg) {}
-
- protected:
-  virtual ~WebSocketStreamHandleDelegate() {}
-};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
+// 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_CHILD_WEBSOCKETSTREAMHANDLE_DELEGATE_H_

+#define WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_DELEGATE_H_

+

+#include "base/strings/string16.h"

+

+class GURL;

+

+namespace WebKit {

+class WebSocketStreamHandle;

+}

+

+namespace webkit_glue {

+

+class WebSocketStreamHandleDelegate {

+ public:

+  WebSocketStreamHandleDelegate() {}

+

+  virtual void WillOpenStream(WebKit::WebSocketStreamHandle* handle,

+                              const GURL& url) {}

+  virtual void WillSendData(WebKit::WebSocketStreamHandle* handle,

+                            const char* data, int len) {}

+

+  virtual void DidOpenStream(WebKit::WebSocketStreamHandle* handle,

+                             int max_amount_send_allowed) {}

+  virtual void DidSendData(WebKit::WebSocketStreamHandle* handle,

+                           int amount_sent) {}

+  virtual void DidReceiveData(WebKit::WebSocketStreamHandle* handle,

+                              const char* data, int len) {}

+  virtual void DidClose(WebKit::WebSocketStreamHandle*) {}

+  virtual void DidFail(WebKit::WebSocketStreamHandle* handle,

+                       int error_code,

+                       const string16& error_msg) {}

+

+ protected:

+  virtual ~WebSocketStreamHandleDelegate() {}

+};

+

+}  // namespace webkit_glue

+

+#endif  // WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_DELEGATE_H_

diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/child/websocketstreamhandle_impl.cc
index 7736dd5..f7da0e2 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/child/websocketstreamhandle_impl.cc
@@ -4,7 +4,7 @@
 
 // An implementation of WebSocketStreamHandle.
 
-#include "webkit/glue/websocketstreamhandle_impl.h"
+#include "webkit/child/websocketstreamhandle_impl.h"
 
 #include <vector>
 
@@ -17,9 +17,9 @@
 #include "third_party/WebKit/public/platform/WebSocketStreamError.h"
 #include "third_party/WebKit/public/platform/WebSocketStreamHandleClient.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
+#include "webkit/child/websocketstreamhandle_delegate.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
-#include "webkit/glue/websocketstreamhandle_delegate.h"
 
 using WebKit::WebData;
 using WebKit::WebSocketStreamError;
diff --git a/webkit/glue/websocketstreamhandle_impl.h b/webkit/child/websocketstreamhandle_impl.h
index 827bb88..911b83e2 100644
--- a/webkit/glue/websocketstreamhandle_impl.h
+++ b/webkit/child/websocketstreamhandle_impl.h
@@ -1,40 +1,40 @@
-// 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_WEBSOCKETSTREAMHANDLE_IMPL_H_
-#define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_
-
-#include "base/memory/ref_counted.h"
-#include "base/supports_user_data.h"
-#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h"
-
-namespace webkit_glue {
-
-class WebKitPlatformSupportImpl;
-
-class WebSocketStreamHandleImpl
-    : public base::SupportsUserData,
-      public WebKit::WebSocketStreamHandle {
- public:
-  explicit WebSocketStreamHandleImpl(WebKitPlatformSupportImpl* platform);
-  virtual ~WebSocketStreamHandleImpl();
-
-  // WebSocketStreamHandle methods:
-  virtual void connect(
-      const WebKit::WebURL& url,
-      WebKit::WebSocketStreamHandleClient* client);
-  virtual bool send(const WebKit::WebData& data);
-  virtual void close();
-
- private:
-  class Context;
-  scoped_refptr<Context> context_;
-  WebKitPlatformSupportImpl* platform_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebSocketStreamHandleImpl);
-};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_
+// 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_CHILD_WEBSOCKETSTREAMHANDLE_IMPL_H_

+#define WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_IMPL_H_

+

+#include "base/memory/ref_counted.h"

+#include "base/supports_user_data.h"

+#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h"

+

+namespace webkit_glue {

+

+class WebKitPlatformSupportImpl;

+

+class WebSocketStreamHandleImpl

+    : public base::SupportsUserData,

+      public WebKit::WebSocketStreamHandle {

+ public:

+  explicit WebSocketStreamHandleImpl(WebKitPlatformSupportImpl* platform);

+  virtual ~WebSocketStreamHandleImpl();

+

+  // WebSocketStreamHandle methods:

+  virtual void connect(

+      const WebKit::WebURL& url,

+      WebKit::WebSocketStreamHandleClient* client);

+  virtual bool send(const WebKit::WebData& data);

+  virtual void close();

+

+ private:

+  class Context;

+  scoped_refptr<Context> context_;

+  WebKitPlatformSupportImpl* platform_;

+

+  DISALLOW_COPY_AND_ASSIGN(WebSocketStreamHandleImpl);

+};

+

+}  // namespace webkit_glue

+

+#endif  // WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_IMPL_H_

diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/child/weburlloader_impl.cc
index 2f12b18..40b15ed 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/child/weburlloader_impl.cc
@@ -4,7 +4,7 @@
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
-#include "webkit/glue/weburlloader_impl.h"
+#include "webkit/child/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ -24,18 +24,18 @@
 #include "third_party/WebKit/public/platform/WebHTTPLoadInfo.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
-#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLLoadTiming.h"
+#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
+#include "webkit/child/ftp_directory_listing_response_delegate.h"
+#include "webkit/child/multipart_response_delegate.h"
+#include "webkit/child/resource_loader_bridge.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
+#include "webkit/child/weburlrequest_extradata_impl.h"
+#include "webkit/child/weburlresponse_extradata_impl.h"
 #include "webkit/common/resource_request_body.h"
-#include "webkit/glue/ftp_directory_listing_response_delegate.h"
-#include "webkit/glue/multipart_response_delegate.h"
-#include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
-#include "webkit/glue/weburlrequest_extradata_impl.h"
-#include "webkit/glue/weburlresponse_extradata_impl.h"
 
 using base::Time;
 using base::TimeTicks;
diff --git a/webkit/glue/weburlloader_impl.h b/webkit/child/weburlloader_impl.h
index ecca9f4..1412b32 100644
--- a/webkit/glue/weburlloader_impl.h
+++ b/webkit/child/weburlloader_impl.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBURLLOADER_IMPL_H_
-#define WEBKIT_GLUE_WEBURLLOADER_IMPL_H_
+#ifndef WEBKIT_CHILD_WEBURLLOADER_IMPL_H_
+#define WEBKIT_CHILD_WEBURLLOADER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
-#include "webkit/glue/webkit_glue_export.h"
 
 namespace webkit_glue {
 
@@ -42,4 +41,4 @@ class WebURLLoaderImpl : public WebKit::WebURLLoader {
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_WEBURLLOADER_IMPL_H_
+#endif  // WEBKIT_CHILD_WEBURLLOADER_IMPL_H_
diff --git a/webkit/glue/weburlrequest_extradata_impl.cc b/webkit/child/weburlrequest_extradata_impl.cc
index d9e7462..231672c 100644
--- a/webkit/glue/weburlrequest_extradata_impl.cc
+++ b/webkit/child/weburlrequest_extradata_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 "webkit/glue/weburlrequest_extradata_impl.h"
+#include "webkit/child/weburlrequest_extradata_impl.h"
 
 using WebKit::WebReferrerPolicy;
 using WebKit::WebString;
diff --git a/webkit/glue/weburlrequest_extradata_impl.h b/webkit/child/weburlrequest_extradata_impl.h
index 151c4845..6e5dccd 100644
--- a/webkit/glue/weburlrequest_extradata_impl.h
+++ b/webkit/child/weburlrequest_extradata_impl.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_
-#define WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_
+#ifndef WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_
+#define WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/child/webkit_child_export.h"
 
 namespace webkit_glue {
 
 // Base class for Chrome's implementation of the "extra data" stored in each
 // ResourceRequest.
-class WEBKIT_COMMON_EXPORT WebURLRequestExtraDataImpl :
+class WEBKIT_CHILD_EXPORT WebURLRequestExtraDataImpl :
     public NON_EXPORTED_BASE(WebKit::WebURLRequest::ExtraData) {
  public:
   // |custom_user_agent| is used to communicate an overriding custom user agent
@@ -42,4 +42,4 @@ class WEBKIT_COMMON_EXPORT WebURLRequestExtraDataImpl :
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_
+#endif  // WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_
diff --git a/webkit/glue/weburlresponse_extradata_impl.cc b/webkit/child/weburlresponse_extradata_impl.cc
index 4063662..89ace8a 100644
--- a/webkit/glue/weburlresponse_extradata_impl.cc
+++ b/webkit/child/weburlresponse_extradata_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 "webkit/glue/weburlresponse_extradata_impl.h"
+#include "webkit/child/weburlresponse_extradata_impl.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/glue/weburlresponse_extradata_impl.h b/webkit/child/weburlresponse_extradata_impl.h
index c26325c..ac87d7e 100644
--- a/webkit/glue/weburlresponse_extradata_impl.h
+++ b/webkit/child/weburlresponse_extradata_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 WEBKIT_GLUE_WEBURLRESPONSE_EXTRADATA_IMPL_H_
-#define WEBKIT_GLUE_WEBURLRESPONSE_EXTRADATA_IMPL_H_
+#ifndef WEBKIT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_
+#define WEBKIT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_
 
 #include <string>
 
@@ -11,12 +11,12 @@
 #include "base/compiler_specific.h"
 #include "net/http/http_response_info.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "webkit/common/webkit_common_export.h"
+#include "webkit/child/webkit_child_export.h"
 
 namespace webkit_glue {
 
 // Base class for Chrome's implementation of the "extra data".
-class WEBKIT_COMMON_EXPORT WebURLResponseExtraDataImpl :
+class WEBKIT_CHILD_EXPORT WebURLResponseExtraDataImpl :
     public NON_EXPORTED_BASE(WebKit::WebURLResponse::ExtraData) {
  public:
   explicit WebURLResponseExtraDataImpl(
@@ -93,4 +93,4 @@ class WEBKIT_COMMON_EXPORT WebURLResponseExtraDataImpl :
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_WEBURLRESPONSE_EXTRADATA_IMPL_H_
+#endif  // WEBKIT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_
diff --git a/webkit/common/resource_request_body.h b/webkit/common/resource_request_body.h
index 5c1edd1..c0bdc08 100644
--- a/webkit/common/resource_request_body.h
+++ b/webkit/common/resource_request_body.h
@@ -62,4 +62,4 @@ class WEBKIT_COMMON_EXPORT ResourceRequestBody
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_RESOURCE_REQUEST_BODY_H_
+#endif  // WEBKIT_COMMON_RESOURCE_REQUEST_BODY_H_
diff --git a/webkit/glue/resource_type.cc b/webkit/common/resource_type.cc
index e6df456..2c416d3 100644
--- a/webkit/glue/resource_type.cc
+++ b/webkit/common/resource_type.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 "webkit/glue/resource_type.h"
+#include "webkit/common/resource_type.h"
 
 #include "base/logging.h"
 
diff --git a/webkit/glue/resource_type.h b/webkit/common/resource_type.h
index f083806..9ec7909 100644
--- a/webkit/glue/resource_type.h
+++ b/webkit/common/resource_type.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_RESOURCE_TYPE_H__
-#define WEBKIT_GLUE_RESOURCE_TYPE_H__
+#ifndef WEBKIT_COMMON_RESOURCE_TYPE_H__
+#define WEBKIT_COMMON_RESOURCE_TYPE_H__
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/common/webkit_common_export.h"
 
 class ResourceType {
  public:
@@ -41,7 +41,7 @@ class ResourceType {
     return static_cast<Type>(type);
   }
 
-  WEBKIT_GLUE_EXPORT static Type FromTargetType(
+  WEBKIT_COMMON_EXPORT static Type FromTargetType(
       WebKit::WebURLRequest::TargetType type);
 
   static bool IsFrame(ResourceType::Type type) {
@@ -67,4 +67,4 @@ class ResourceType {
   ResourceType();
   ~ResourceType();
 };
-#endif  // WEBKIT_GLUE_RESOURCE_TYPE_H__
+#endif  // WEBKIT_COMMON_RESOURCE_TYPE_H__
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index e3b6579..af1c688 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -15,8 +15,8 @@
         'WEBKIT_COMMON_IMPLEMENTATION',
       ],
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ -39,10 +39,10 @@
         'cursors/webcursor_aura.cc',
         'cursors/webcursor_aurawin.cc',
         'cursors/webcursor_aurax11.cc',
-        'cursors/webcursor_null.cc',
         'cursors/webcursor_gtk.cc',
         'cursors/webcursor_gtk_data.h',
         'cursors/webcursor_mac.mm',
+        'cursors/webcursor_null.cc',
         'cursors/webcursor_win.cc',
         'data_element.cc',
         'data_element.h',
@@ -52,6 +52,8 @@
         'resource_request_body.h',
         'resource_response_info.cc',
         'resource_response_info.h',
+        'resource_type.cc',
+        'resource_type.h',
       ],
 
       'conditions': [
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 2ef0e57..4c832f3 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -89,39 +89,4 @@ int GetGlyphPageCount() {
 
 COMPILE_ASSERT(std::numeric_limits<double>::has_quiet_NaN, has_quiet_NaN);
 
-#if defined(OS_LINUX) || defined(OS_ANDROID)
-size_t MemoryUsageKB() {
-  struct mallinfo minfo = mallinfo();
-  uint64_t mem_usage =
-#if defined(USE_TCMALLOC)
-      minfo.uordblks
-#else
-      (minfo.hblkhd + minfo.arena)
-#endif
-      >> 10;
-
-  v8::HeapStatistics stat;
-  // TODO(svenpanne) The call below doesn't take web workers into account, this
-  // has to be done manually by iterating over all Isolates involved.
-  v8::Isolate::GetCurrent()->GetHeapStatistics(&stat);
-  return mem_usage + (static_cast<uint64_t>(stat.total_heap_size()) >> 10);
-}
-#elif defined(OS_MACOSX)
-size_t MemoryUsageKB() {
-  scoped_ptr<base::ProcessMetrics> process_metrics(
-      // The default port provider is sufficient to get data for the current
-      // process.
-      base::ProcessMetrics::CreateProcessMetrics(
-          base::GetCurrentProcessHandle(), NULL));
-  return process_metrics->GetWorkingSetSize() >> 10;
-}
-#else
-size_t MemoryUsageKB() {
-  scoped_ptr<base::ProcessMetrics> process_metrics(
-      base::ProcessMetrics::CreateProcessMetrics(
-          base::GetCurrentProcessHandle()));
-  return process_metrics->GetPagefileUsage() >> 10;
-}
-#endif
-
 } // namespace webkit_glue
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index a12d4c6..347fe30 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -19,26 +19,38 @@
       ],
       '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)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
         '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
         '<(DEPTH)/ui/ui.gyp:ui',
-
-        # TODO(scottmg): crbug.com/237249
-        'glue',
+        '<(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/plugins/webkit_plugins.gyp:plugins_common',
       ],
 
       'include_dirs': [
         # For JNI generated header.
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
       ],
+      'hard_dependency': 1,
 
       'sources': [
         '../child/fling_animator_impl_android.cc',
         '../child/fling_animator_impl_android.h',
         '../child/fling_curve_configuration.cc',
         '../child/fling_curve_configuration.h',
+        '../child/ftp_directory_listing_response_delegate.cc',
+        '../child/ftp_directory_listing_response_delegate.h',
+        '../child/multipart_response_delegate.cc',
+        '../child/multipart_response_delegate.h',
+        '../child/resource_loader_bridge.cc',
+        '../child/resource_loader_bridge.h',
         '../child/touch_fling_gesture_curve.cc',
         '../child/touch_fling_gesture_curve.h',
         '../child/web_discardable_memory_impl.cc',
@@ -46,8 +58,15 @@
         '../child/webfallbackthemeengine_impl.cc',
         '../child/webfallbackthemeengine_impl.h',
         '../child/webkit_child_export.h',
+        '../child/webkit_child_helpers.cc',
+        '../child/webkit_child_helpers.h',
         '../child/webkitplatformsupport_child_impl.cc',
         '../child/webkitplatformsupport_child_impl.h',
+        '../child/webkitplatformsupport_impl.cc',
+        '../child/webkitplatformsupport_impl.h',
+        '../child/websocketstreamhandle_delegate.h',
+        '../child/websocketstreamhandle_impl.cc',
+        '../child/websocketstreamhandle_impl.h',
         '../child/webthemeengine_impl_android.cc',
         '../child/webthemeengine_impl_android.h',
         '../child/webthemeengine_impl_default.cc',
@@ -58,6 +77,12 @@
         '../child/webthemeengine_impl_win.h',
         '../child/webthread_impl.cc',
         '../child/webthread_impl.h',
+        '../child/weburlloader_impl.cc',
+        '../child/weburlloader_impl.h',
+        '../child/weburlrequest_extradata_impl.cc',
+        '../child/weburlrequest_extradata_impl.h',
+        '../child/weburlresponse_extradata_impl.cc',
+        '../child/weburlresponse_extradata_impl.h',
         '../child/worker_task_runner.cc',
         '../child/worker_task_runner.h',
       ],
@@ -129,13 +154,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
       'sources': [
-        'ftp_directory_listing_response_delegate.cc',
-        'ftp_directory_listing_response_delegate.h',
         'network_list_observer.h',
-        'resource_loader_bridge.cc',
-        'resource_loader_bridge.h',
-        'resource_type.cc',
-        'resource_type.h',
         'simple_webmimeregistry_impl.cc',
         'simple_webmimeregistry_impl.h',
         'webfileutilities_impl.cc',
@@ -143,14 +162,7 @@
         'webkit_glue.cc',
         'webkit_glue.h',
         'webkit_glue_export.h',
-        'webkitplatformsupport_impl.cc',
-        'webkitplatformsupport_impl.h',
         'websocketstreamhandle_bridge.h',
-        'websocketstreamhandle_delegate.h',
-        'websocketstreamhandle_impl.cc',
-        'websocketstreamhandle_impl.h',
-        'weburlloader_impl.cc',
-        'weburlloader_impl.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
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 2a9d74d..33fed9f 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -46,12 +46,6 @@ WEBKIT_GLUE_EXPORT WebKit::WebCanvas* ToWebCanvas(SkCanvas*);
 // used to get memory usage statistics.
 WEBKIT_GLUE_EXPORT int GetGlyphPageCount();
 
-// Returns an estimate of the memory usage of the renderer process. Different
-// platforms implement this function differently, and count in different
-// allocations. Results are not comparable across platforms. The estimate is
-// computed inside the sandbox and thus its not always accurate.
-WEBKIT_GLUE_EXPORT size_t MemoryUsageKB();
-
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBKIT_GLUE_H_
diff --git a/webkit/glue/webkit_glue_common.gyp b/webkit/glue/webkit_glue_common.gyp
index ff845ef..51f152e 100644
--- a/webkit/glue/webkit_glue_common.gyp
+++ b/webkit/glue/webkit_glue_common.gyp
@@ -26,12 +26,6 @@
         '../common/webkit_common_export.h',
         '../common/webpreferences.cc',
         '../common/webpreferences.h',
-        'multipart_response_delegate.cc',
-        'multipart_response_delegate.h',
-        'weburlrequest_extradata_impl.cc',
-        'weburlrequest_extradata_impl.h',
-        'weburlresponse_extradata_impl.cc',
-        'weburlresponse_extradata_impl.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
diff --git a/webkit/glue/webkit_glue_unittest.cc b/webkit/glue/webkit_glue_unittest.cc
index 27879e8..50b57ab 100644
--- a/webkit/glue/webkit_glue_unittest.cc
+++ b/webkit/glue/webkit_glue_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
 
 namespace {
 
diff --git a/webkit/mocks/mock_weburlloader.h b/webkit/mocks/mock_weburlloader.h
index 68ff9a2..a9e2d6b 100644
--- a/webkit/mocks/mock_weburlloader.h
+++ b/webkit/mocks/mock_weburlloader.h
@@ -6,7 +6,7 @@
 #define WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
-#include "webkit/glue/weburlloader_impl.h"
+#include "webkit/child/weburlloader_impl.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/plugins/ppapi/url_request_info_util.cc b/webkit/plugins/ppapi/url_request_info_util.cc
index 774a3c9..b9e765a 100644
--- a/webkit/plugins/ppapi/url_request_info_util.cc
+++ b/webkit/plugins/ppapi/url_request_info_util.cc
@@ -18,7 +18,7 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
-#include "webkit/glue/weburlrequest_extradata_impl.h"
+#include "webkit/child/weburlrequest_extradata_impl.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi
index 0479a6c..c63f524 100644
--- a/webkit/plugins/webkit_plugins.gypi
+++ b/webkit/plugins/webkit_plugins.gypi
@@ -41,6 +41,7 @@
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
+        'glue_child',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index bde978b..8b3c5d2 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -14,12 +14,6 @@
 #include "media/base/media.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
-#include "third_party/WebKit/public/web/WebDatabase.h"
-#include "third_party/WebKit/public/web/WebKit.h"
-#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
-#include "third_party/WebKit/public/web/WebScriptController.h"
-#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
-#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
 #include "third_party/WebKit/public/platform/WebAudioDevice.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebFileSystem.h"
@@ -28,14 +22,20 @@
 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/web/WebDatabase.h"
+#include "third_party/WebKit/public/web/WebKit.h"
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
+#include "third_party/WebKit/public/web/WebScriptController.h"
+#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
+#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
 #include "v8/include/v8.h"
 #include "webkit/browser/database/vfs_backend.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
 #include "webkit/common/gpu/test_context_provider_factory.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h"
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/support/gc_extension.h"
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index b96b537..bdb99f9 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -17,10 +17,10 @@
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "url/url_util.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
 #include "webkit/common/user_agent/user_agent.h"
 #include "webkit/common/user_agent/user_agent_util.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/test_webkit_platform_support.h"