reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child

Win x64 warning suppression, and allocator dependency on linux for shared_library build compared to previous land.

TBR=jam@chromium.org

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

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

6 files changed, 8 insertions, 6 deletions

diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 5d0c6fb..c00b5fb 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+components/autofill/content/renderer",
   "+components/autofill/core/common",
   "+components/visitedlink/renderer",
+  "+content/public/child",
   "+content/public/renderer",
   "+extensions/common",
   "+grit",  # For generated headers
@@ -13,6 +14,7 @@ include_rules = [
   "+sandbox/win/src",
   "+skia",
 
+  "+webkit/child",
   "+webkit/common",
   "+webkit/glue",
   "+webkit/renderer",
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index e213149..f4a5f8b 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -33,7 +33,7 @@
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/extensions/extension_localization_peer.h"
 #include "chrome/renderer/security_filter_peer.h"
-#include "content/public/common/resource_dispatcher_delegate.h"
+#include "content/public/child/resource_dispatcher_delegate.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
@@ -41,7 +41,6 @@
 #include "media/base/media_switches.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
-#include "third_party/sqlite/sqlite3.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -50,6 +49,7 @@
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/WebKit/public/web/WebView.h"
+#include "third_party/sqlite/sqlite3.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index b36149a..fb8ddf8 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -19,7 +19,7 @@
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "webkit/glue/weburlresponse_extradata_impl.h"
+#include "webkit/child/weburlresponse_extradata_impl.h"
 
 using WebKit::WebDataSource;
 using WebKit::WebFrame;
diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h
index 531fd6b..3245d440 100644
--- a/chrome/renderer/extensions/extension_localization_peer.h
+++ b/chrome/renderer/extensions/extension_localization_peer.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "ipc/ipc_sender.h"
-#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/child/resource_loader_bridge.h"
 
 // The ExtensionLocalizationPeer is a proxy to a
 // webkit_glue::ResourceLoaderBridge::Peer instance.  It is used to pre-process
diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
index dd16705..f56f924 100644
--- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
@@ -14,7 +14,7 @@
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/child/resource_loader_bridge.h"
 
 using testing::_;
 using testing::DoAll;
diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h
index b4dd637..ddc9e64 100644
--- a/chrome/renderer/security_filter_peer.h
+++ b/chrome/renderer/security_filter_peer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_RENDERER_SECURITY_FILTER_PEER_H_
 #define CHROME_RENDERER_SECURITY_FILTER_PEER_H_
 
-#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/child/resource_loader_bridge.h"
 
 // The SecurityFilterPeer is a proxy to a
 // webkit_glue::ResourceLoaderBridge::Peer instance.  It is used to pre-process