Rename content/common_child to content/child

As prerequiste for linked bug.

TBR=palmer@chromium.org
R=jam@chromium.org,jamesr@chromium.org
BUG=246357

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

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

69 files changed, 288 insertions, 288 deletions

diff --git a/content/browser/renderer_host/java/DEPS b/content/browser/renderer_host/java/DEPS
index 6866a15..430199d 100644
--- a/content/browser/renderer_host/java/DEPS
+++ b/content/browser/renderer_host/java/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+content/common_child", # For java bridge bindings
+  "+content/child", # For java bridge bindings
 ]
diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.h b/content/browser/renderer_host/java/java_bridge_channel_host.h
index 2e8968b..2f54259 100644
--- a/content/browser/renderer_host/java/java_bridge_channel_host.h
+++ b/content/browser/renderer_host/java/java_bridge_channel_host.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
 
-#include "content/common_child/np_channel_base.h"
+#include "content/child/np_channel_base.h"
 
 namespace content {
 
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
index a1f1624..757fd15 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
@@ -9,10 +9,10 @@
 #include "base/threading/thread.h"
 #include "content/browser/renderer_host/java/java_bridge_channel_host.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/child/npobject_stub.h"
+#include "content/child/npobject_util.h"  // For CreateNPVariantParam()
 #include "content/common/child_process.h"
 #include "content/common/java_bridge_messages.h"
-#include "content/common_child/npobject_stub.h"
-#include "content/common_child/npobject_util.h"  // For CreateNPVariantParam()
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
index 2f0c5f6..5a7af2b 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
-#include "content/common_child/npobject_stub.h"
+#include "content/child/npobject_stub.h"
 #include "content/public/browser/render_view_host_observer.h"
 
 class RouteIDGenerator;
diff --git a/content/common_child/fileapi/OWNERS b/content/child/fileapi/OWNERS
index 9e9046e..9e9046e 100644
--- a/content/common_child/fileapi/OWNERS
+++ b/content/child/fileapi/OWNERS
diff --git a/content/common_child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc
index 6648417..3935522 100644
--- a/content/common_child/fileapi/webfilesystem_callback_adapters.cc
+++ b/content/child/fileapi/webfilesystem_callback_adapters.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/fileapi/webfilesystem_callback_adapters.h"
+#include "content/child/fileapi/webfilesystem_callback_adapters.h"
 
 #include <string>
 #include <vector>
@@ -10,9 +10,9 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/common/fileapi/directory_entry.h"
 #include "webkit/common/fileapi/file_system_util.h"
diff --git a/content/common_child/fileapi/webfilesystem_callback_adapters.h b/content/child/fileapi/webfilesystem_callback_adapters.h
index 3592f9e..408d71d 100644
--- a/content/common_child/fileapi/webfilesystem_callback_adapters.h
+++ b/content/child/fileapi/webfilesystem_callback_adapters.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_FILEAPI_WEBFILESYSTEM_CALLBACK_ADAPTERS_H_
-#define CONTENT_COMMON_CHILD_FILEAPI_WEBFILESYSTEM_CALLBACK_ADAPTERS_H_
+#ifndef CONTENT_CHILD_FILEAPI_WEBFILESYSTEM_CALLBACK_ADAPTERS_H_
+#define CONTENT_CHILD_FILEAPI_WEBFILESYSTEM_CALLBACK_ADAPTERS_H_
 
 #include "base/basictypes.h"
 #include "base/platform_file.h"
@@ -45,4 +45,4 @@ void OpenFileSystemCallbackAdapter(
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_FILEAPI_WEBFILESYSTEM_CALLBACK_ADAPTERS_H_
+#endif  // CONTENT_CHILD_FILEAPI_WEBFILESYSTEM_CALLBACK_ADAPTERS_H_
diff --git a/content/common_child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index 44e4fba..0e6ed21 100644
--- a/content/common_child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -1,18 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/fileapi/webfilesystem_impl.h"
+#include "content/child/fileapi/webfilesystem_impl.h"
 
 #include "base/bind.h"
+#include "content/child/fileapi/webfilesystem_callback_adapters.h"
+#include "content/child/fileapi/webfilewriter_impl.h"
 #include "content/common/child_thread.h"
 #include "content/common/fileapi/file_system_dispatcher.h"
-#include "content/common_child/fileapi/webfilesystem_callback_adapters.h"
-#include "content/common_child/fileapi/webfilewriter_impl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.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 "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebFileInfo;
diff --git a/content/common_child/fileapi/webfilesystem_impl.h b/content/child/fileapi/webfilesystem_impl.h
index e880c5b..2bcf535 100644
--- a/content/common_child/fileapi/webfilesystem_impl.h
+++ b/content/child/fileapi/webfilesystem_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_FILEAPI_WEBFILESYSTEM_IMPL_H_
-#define CONTENT_COMMON_CHILD_FILEAPI_WEBFILESYSTEM_IMPL_H_
+#ifndef CONTENT_CHILD_FILEAPI_WEBFILESYSTEM_IMPL_H_
+#define CONTENT_CHILD_FILEAPI_WEBFILESYSTEM_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -66,4 +66,4 @@ class WebFileSystemImpl : public WebKit::WebFileSystem {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_FILEAPI_WEBFILESYSTEM_IMPL_H_
+#endif  // CONTENT_CHILD_FILEAPI_WEBFILESYSTEM_IMPL_H_
diff --git a/content/common_child/fileapi/webfilewriter_impl.cc b/content/child/fileapi/webfilewriter_impl.cc
index 16de6e1..dc37c99 100644
--- a/content/common_child/fileapi/webfilewriter_impl.cc
+++ b/content/child/fileapi/webfilewriter_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/fileapi/webfilewriter_impl.h"
+#include "content/child/fileapi/webfilewriter_impl.h"
 
 #include "base/bind.h"
 #include "content/common/child_thread.h"
diff --git a/content/common_child/fileapi/webfilewriter_impl.h b/content/child/fileapi/webfilewriter_impl.h
index 3b1118f..718139d 100644
--- a/content/common_child/fileapi/webfilewriter_impl.h
+++ b/content/child/fileapi/webfilewriter_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_FILEAPI_WEBFILEWRITER_IMPL_H_
-#define CONTENT_COMMON_CHILD_FILEAPI_WEBFILEWRITER_IMPL_H_
+#ifndef CONTENT_CHILD_FILEAPI_WEBFILEWRITER_IMPL_H_
+#define CONTENT_CHILD_FILEAPI_WEBFILEWRITER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -32,4 +32,4 @@ class WebFileWriterImpl : public fileapi::WebFileWriterBase,
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_FILEAPI_WEBFILEWRITER_IMPL_H_
+#endif  // CONTENT_CHILD_FILEAPI_WEBFILEWRITER_IMPL_H_
diff --git a/content/common_child/indexed_db/OWNERS b/content/child/indexed_db/OWNERS
index ed5258c..ed5258c 100644
--- a/content/common_child/indexed_db/OWNERS
+++ b/content/child/indexed_db/OWNERS
diff --git a/content/common_child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
index f06f19e..24c403d 100644
--- a/content/common_child/indexed_db/indexed_db_dispatcher.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_local.h"
+#include "content/child/indexed_db/proxy_webidbcursor_impl.h"
+#include "content/child/indexed_db/proxy_webidbdatabase_impl.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/common_child/indexed_db/proxy_webidbcursor_impl.h"
-#include "content/common_child/indexed_db/proxy_webidbdatabase_impl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
diff --git a/content/common_child/indexed_db/indexed_db_dispatcher.h b/content/child/indexed_db/indexed_db_dispatcher.h
index cba01fe..f8b2102 100644
--- a/content/common_child/indexed_db/indexed_db_dispatcher.h
+++ b/content/child/indexed_db/indexed_db_dispatcher.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
-#define CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#ifndef CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#define CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <map>
 #include <vector>
@@ -238,4 +238,4 @@ class CONTENT_EXPORT IndexedDBDispatcher
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#endif  // CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
diff --git a/content/common_child/indexed_db/indexed_db_dispatcher_unittest.cc b/content/child/indexed_db/indexed_db_dispatcher_unittest.cc
index f4c900c..155ae7f 100644
--- a/content/common_child/indexed_db/indexed_db_dispatcher_unittest.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/indexed_db/indexed_db_key.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
diff --git a/content/common_child/indexed_db/indexed_db_message_filter.cc b/content/child/indexed_db/indexed_db_message_filter.cc
index 360a6b9..949c167 100644
--- a/content/common_child/indexed_db/indexed_db_message_filter.cc
+++ b/content/child/indexed_db/indexed_db_message_filter.cc
@@ -1,16 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/indexed_db/indexed_db_message_filter.h"
+#include "content/child/indexed_db/indexed_db_message_filter.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/pickle.h"
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
 #include "webkit/glue/worker_task_runner.h"
 
 using webkit_glue::WorkerTaskRunner;
diff --git a/content/common_child/indexed_db/indexed_db_message_filter.h b/content/child/indexed_db/indexed_db_message_filter.h
index 8cb3d9a..04708d3 100644
--- a/content/common_child/indexed_db/indexed_db_message_filter.h
+++ b/content/child/indexed_db/indexed_db_message_filter.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
-#define CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
+#ifndef CONTENT_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
+#define CONTENT_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
 
 #include "ipc/ipc_channel_proxy.h"
 
@@ -44,4 +44,4 @@ class IndexedDBMessageFilter : public IPC::ChannelProxy::MessageFilter {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#endif  // CONTENT_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
diff --git a/content/common_child/indexed_db/proxy_webidbcursor_impl.cc b/content/child/indexed_db/proxy_webidbcursor_impl.cc
index a62594d..4afd8d9 100644
--- a/content/common_child/indexed_db/proxy_webidbcursor_impl.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/indexed_db/proxy_webidbcursor_impl.h"
+#include "content/child/indexed_db/proxy_webidbcursor_impl.h"
 
 #include <vector>
 
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
 
 using WebKit::WebData;
 using WebKit::WebIDBCallbacks;
diff --git a/content/common_child/indexed_db/proxy_webidbcursor_impl.h b/content/child/indexed_db/proxy_webidbcursor_impl.h
index ce529d8..d3a1c6b 100644
--- a/content/common_child/indexed_db/proxy_webidbcursor_impl.h
+++ b/content/child/indexed_db/proxy_webidbcursor_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
-#define CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
+#ifndef CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
+#define CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
 
 #include <deque>
 #include <vector>
@@ -68,4 +68,4 @@ class CONTENT_EXPORT RendererWebIDBCursorImpl
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
+#endif  // CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
diff --git a/content/common_child/indexed_db/proxy_webidbcursor_impl_unittest.cc b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
index 0fb09426..a9c6e24 100644
--- a/content/common_child/indexed_db/proxy_webidbcursor_impl_unittest.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
+#include "content/child/indexed_db/proxy_webidbcursor_impl.h"
 #include "content/common/indexed_db/indexed_db_key.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
-#include "content/common_child/indexed_db/proxy_webidbcursor_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
diff --git a/content/common_child/indexed_db/proxy_webidbdatabase_impl.cc b/content/child/indexed_db/proxy_webidbdatabase_impl.cc
index db65e71..d120a85 100644
--- a/content/common_child/indexed_db/proxy_webidbdatabase_impl.cc
+++ b/content/child/indexed_db/proxy_webidbdatabase_impl.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/indexed_db/proxy_webidbdatabase_impl.h"
+#include "content/child/indexed_db/proxy_webidbdatabase_impl.h"
 
 #include <vector>
 
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
 #include "third_party/WebKit/public/platform/WebIDBKeyPath.h"
 #include "third_party/WebKit/public/platform/WebIDBMetadata.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/content/common_child/indexed_db/proxy_webidbdatabase_impl.h b/content/child/indexed_db/proxy_webidbdatabase_impl.h
index d25b36e..7a1b31a 100644
--- a/content/common_child/indexed_db/proxy_webidbdatabase_impl.h
+++ b/content/child/indexed_db/proxy_webidbdatabase_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
-#define CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
+#ifndef CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
+#define CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
@@ -100,4 +100,4 @@ class RendererWebIDBDatabaseImpl : public WebKit::WebIDBDatabase {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
+#endif  // CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
diff --git a/content/common_child/indexed_db/proxy_webidbfactory_impl.cc b/content/child/indexed_db/proxy_webidbfactory_impl.cc
index 1cfeb42..42a561d 100644
--- a/content/common_child/indexed_db/proxy_webidbfactory_impl.cc
+++ b/content/child/indexed_db/proxy_webidbfactory_impl.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/indexed_db/proxy_webidbfactory_impl.h"
+#include "content/child/indexed_db/proxy_webidbfactory_impl.h"
 
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/child_thread.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using WebKit::WebIDBCallbacks;
diff --git a/content/common_child/indexed_db/proxy_webidbfactory_impl.h b/content/child/indexed_db/proxy_webidbfactory_impl.h
index 089f58c..778838b 100644
--- a/content/common_child/indexed_db/proxy_webidbfactory_impl.h
+++ b/content/child/indexed_db/proxy_webidbfactory_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
-#define CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
+#ifndef CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
+#define CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
 
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h"
@@ -43,4 +43,4 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
+#endif  // CONTENT_CHILD_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
diff --git a/content/common_child/np_channel_base.cc b/content/child/np_channel_base.cc
index 94fb691..34aa22b 100644
--- a/content/common_child/np_channel_base.cc
+++ b/content/child/np_channel_base.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/np_channel_base.h"
+#include "content/child/np_channel_base.h"
 
 #include <stack>
 
diff --git a/content/common_child/np_channel_base.h b/content/child/np_channel_base.h
index d5352f3..02ada3e 100644
--- a/content/common_child/np_channel_base.h
+++ b/content/child/np_channel_base.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_NP_CHANNEL_BASE_H_
-#define CONTENT_COMMON_CHILD_NP_CHANNEL_BASE_H_
+#ifndef CONTENT_CHILD_NP_CHANNEL_BASE_H_
+#define CONTENT_CHILD_NP_CHANNEL_BASE_H_
 
 #include <string>
 
@@ -12,8 +12,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
+#include "content/child/npobject_base.h"
 #include "content/common/message_router.h"
-#include "content/common_child/npobject_base.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 
@@ -200,4 +200,4 @@ class NPChannelBase : public IPC::Listener,
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_NP_CHANNEL_BASE_H_
+#endif  // CONTENT_CHILD_NP_CHANNEL_BASE_H_
diff --git a/content/common_child/npobject_base.h b/content/child/npobject_base.h
index 0dcb04c..042daf7 100644
--- a/content/common_child/npobject_base.h
+++ b/content/child/npobject_base.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
 // Base interface used by NPChannelBase and implemented by NPObjectProxy and
 // NPObjectStub.
 
-#ifndef CONTENT_COMMON_CHILD_NPOBJECT_BASE_H_
-#define CONTENT_COMMON_CHILD_NPOBJECT_BASE_H_
+#ifndef CONTENT_CHILD_NPOBJECT_BASE_H_
+#define CONTENT_CHILD_NPOBJECT_BASE_H_
 
 #include "ipc/ipc_listener.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ -28,4 +28,4 @@ class NPObjectBase {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_NPOBJECT_BASE_H_
+#endif  // CONTENT_CHILD_NPOBJECT_BASE_H_
diff --git a/content/common_child/npobject_proxy.cc b/content/child/npobject_proxy.cc
index 13c5648..0d0b84d 100644
--- a/content/common_child/npobject_proxy.cc
+++ b/content/child/npobject_proxy.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/npobject_proxy.h"
+#include "content/child/npobject_proxy.h"
 
-#include "content/common_child/np_channel_base.h"
-#include "content/common_child/npobject_util.h"
-#include "content/common_child/plugin_messages.h"
+#include "content/child/np_channel_base.h"
+#include "content/child/npobject_util.h"
+#include "content/child/plugin_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_host.h"
diff --git a/content/common_child/npobject_proxy.h b/content/child/npobject_proxy.h
index c46de99..ab7815c 100644
--- a/content/common_child/npobject_proxy.h
+++ b/content/child/npobject_proxy.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
 // A proxy for NPObject that sends all calls to the object to an NPObjectStub
 // running in a different process.
 
-#ifndef CONTENT_COMMON_CHILD_NPOBJECT_PROXY_H_
-#define CONTENT_COMMON_CHILD_NPOBJECT_PROXY_H_
+#ifndef CONTENT_CHILD_NPOBJECT_PROXY_H_
+#define CONTENT_CHILD_NPOBJECT_PROXY_H_
 
 #include "base/memory/ref_counted.h"
-#include "content/common_child/npobject_base.h"
+#include "content/child/npobject_base.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
@@ -124,4 +124,4 @@ class NPObjectProxy : public IPC::Listener,
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_NPOBJECT_PROXY_H_
+#endif  // CONTENT_CHILD_NPOBJECT_PROXY_H_
diff --git a/content/common_child/npobject_stub.cc b/content/child/npobject_stub.cc
index 8fcf535..d3ef7a2 100644
--- a/content/common_child/npobject_stub.cc
+++ b/content/child/npobject_stub.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/npobject_stub.h"
+#include "content/child/npobject_stub.h"
 
-#include "content/common_child/np_channel_base.h"
-#include "content/common_child/npobject_util.h"
-#include "content/common_child/plugin_messages.h"
+#include "content/child/np_channel_base.h"
+#include "content/child/npobject_util.h"
+#include "content/child/plugin_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
diff --git a/content/common_child/npobject_stub.h b/content/child/npobject_stub.h
index ba46255..76b19b4 100644
--- a/content/common_child/npobject_stub.h
+++ b/content/child/npobject_stub.h
@@ -1,18 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
 // A class that receives IPC messages from an NPObjectProxy and calls the real
 // NPObject.
 
-#ifndef CONTENT_COMMON_CHILD_NPOBJECT_STUB_H_
-#define CONTENT_COMMON_CHILD_NPOBJECT_STUB_H_
+#ifndef CONTENT_CHILD_NPOBJECT_STUB_H_
+#define CONTENT_CHILD_NPOBJECT_STUB_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "content/common_child/npobject_base.h"
+#include "content/child/npobject_base.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
@@ -96,4 +96,4 @@ class NPObjectStub : public IPC::Listener,
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_NPOBJECT_STUB_H_
+#endif  // CONTENT_CHILD_NPOBJECT_STUB_H_
diff --git a/content/common_child/npobject_util.cc b/content/child/npobject_util.cc
index 8fce7ad..c86ce91 100644
--- a/content/common_child/npobject_util.cc
+++ b/content/child/npobject_util.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/npobject_util.h"
+#include "content/child/npobject_util.h"
 
 #include "base/string_util.h"
-#include "content/common_child/np_channel_base.h"
-#include "content/common_child/npobject_proxy.h"
-#include "content/common_child/plugin_messages.h"
+#include "content/child/np_channel_base.h"
+#include "content/child/npobject_proxy.h"
+#include "content/child/plugin_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/content/common_child/npobject_util.h b/content/child/npobject_util.h
index 7590c60..bbf52e8 100644
--- a/content/common_child/npobject_util.h
+++ b/content/child/npobject_util.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
 // Helper functions that are used by the NPObject proxy and stub.
 
-#ifndef CONTENT_COMMON_CHILD_NPOBJECT_UTIL_H_
-#define CONTENT_COMMON_CHILD_NPOBJECT_UTIL_H_
+#ifndef CONTENT_CHILD_NPOBJECT_UTIL_H_
+#define CONTENT_CHILD_NPOBJECT_UTIL_H_
 
 #include "build/build_config.h"
 
@@ -13,7 +13,7 @@
 #include <windows.h>
 #endif
 
-#include "content/common_child/npobject_stub.h"
+#include "content/child/npobject_stub.h"
 
 class GURL;
 
@@ -71,4 +71,4 @@ HANDLE GetMessageBoxEvent(HWND hwnd);
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_NPOBJECT_UTIL_H_
+#endif  // CONTENT_CHILD_NPOBJECT_UTIL_H_
diff --git a/content/common_child/plugin_message_generator.cc b/content/child/plugin_message_generator.cc
index c8a7aae..d490345 100644
--- a/content/common_child/plugin_message_generator.cc
+++ b/content/child/plugin_message_generator.cc
@@ -1,33 +1,33 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
 // Get basic type definitions.
 #define IPC_MESSAGE_IMPL
-#include "content/common_child/plugin_message_generator.h"
+#include "content/child/plugin_message_generator.h"
 
 // Generate constructors.
 #include "ipc/struct_constructor_macros.h"
-#include "content/common_child/plugin_message_generator.h"
+#include "content/child/plugin_message_generator.h"
 
 // Generate destructors.
 #include "ipc/struct_destructor_macros.h"
-#include "content/common_child/plugin_message_generator.h"
+#include "content/child/plugin_message_generator.h"
 
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {
-#include "content/common_child/plugin_message_generator.h"
+#include "content/child/plugin_message_generator.h"
 }  // namespace IPC
 
 // Generate param traits read methods.
 #include "ipc/param_traits_read_macros.h"
 namespace IPC {
-#include "content/common_child/plugin_message_generator.h"
+#include "content/child/plugin_message_generator.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
-#include "content/common_child/plugin_message_generator.h"
+#include "content/child/plugin_message_generator.h"
 }  // namespace IPC
diff --git a/content/common_child/plugin_message_generator.h b/content/child/plugin_message_generator.h
index f79e19e..9eddea2 100644
--- a/content/common_child/plugin_message_generator.h
+++ b/content/child/plugin_message_generator.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
 // Multiply-included file, hence no include guard.
 
-#include "content/common_child/plugin_messages.h"
+#include "content/child/plugin_messages.h"
diff --git a/content/common_child/plugin_messages.h b/content/child/plugin_messages.h
index 197ef5e..7c0d825 100644
--- a/content/common_child/plugin_messages.h
+++ b/content/child/plugin_messages.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 //
 // Multiply-included message file, hence no include guard.
 
 #include "build/build_config.h"
+#include "content/child/plugin_param_traits.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
-#include "content/common_child/plugin_param_traits.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/content/common_child/plugin_param_traits.cc b/content/child/plugin_param_traits.cc
index a60255d..53e75a4 100644
--- a/content/common_child/plugin_param_traits.cc
+++ b/content/child/plugin_param_traits.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/plugin_param_traits.h"
+#include "content/child/plugin_param_traits.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "ipc/ipc_message_utils.h"
diff --git a/content/common_child/plugin_param_traits.h b/content/child/plugin_param_traits.h
index 15061a6..b8495c6 100644
--- a/content/common_child/plugin_param_traits.h
+++ b/content/child/plugin_param_traits.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -11,8 +11,8 @@
 // public members, or because the same type is being used in multiple
 // *_messages.h headers.
 
-#ifndef CONTENT_COMMON_CHILD_PLUGIN_PARAM_TRAITS_H_
-#define CONTENT_COMMON_CHILD_PLUGIN_PARAM_TRAITS_H_
+#ifndef CONTENT_CHILD_PLUGIN_PARAM_TRAITS_H_
+#define CONTENT_CHILD_PLUGIN_PARAM_TRAITS_H_
 
 #include <string>
 #include "ipc/ipc_message.h"
@@ -80,4 +80,4 @@ struct ParamTraits<content::NPIdentifier_Param> {
 
 }  // namespace IPC
 
-#endif  // CONTENT_COMMON_CONTENT_PARAM_TRAITS_H_
+#endif  // CONTENT_CHILD_PLUGIN_PARAM_TRAITS_H_
diff --git a/content/common_child/web_database_observer_impl.cc b/content/child/web_database_observer_impl.cc
index fea57b4..00002aa 100644
--- a/content/common_child/web_database_observer_impl.cc
+++ b/content/child/web_database_observer_impl.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/web_database_observer_impl.h"
+#include "content/child/web_database_observer_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "content/common/database_messages.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/sqlite/sqlite3.h"
 
 using WebKit::WebDatabase;
diff --git a/content/common_child/web_database_observer_impl.h b/content/child/web_database_observer_impl.h
index b17bb31..a5b7da3 100644
--- a/content/common_child/web_database_observer_impl.h
+++ b/content/child/web_database_observer_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_CHILD_WEB_DATABASE_OBSERVER_IMPL_H_
-#define CONTENT_COMMON_CHILD_WEB_DATABASE_OBSERVER_IMPL_H_
+#ifndef CONTENT_CHILD_WEB_DATABASE_OBSERVER_IMPL_H_
+#define CONTENT_CHILD_WEB_DATABASE_OBSERVER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "ipc/ipc_sync_message_filter.h"
@@ -50,4 +50,4 @@ class WebDatabaseObserverImpl : public WebKit::WebDatabaseObserver {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
+#endif  // CONTENT_CHILD_WEB_DATABASE_OBSERVER_IMPL_H_
diff --git a/content/common_child/webblobregistry_impl.cc b/content/child/webblobregistry_impl.cc
index 32d754d..b70b883 100644
--- a/content/common_child/webblobregistry_impl.cc
+++ b/content/child/webblobregistry_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "content/common_child/webblobregistry_impl.h"
+#include "content/child/webblobregistry_impl.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
diff --git a/content/common_child/webblobregistry_impl.h b/content/child/webblobregistry_impl.h
index 85ca57f..a624cfc 100644
--- a/content/common_child/webblobregistry_impl.h
+++ b/content/child/webblobregistry_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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 CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
-#define CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
+#ifndef CONTENT_CHILD_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
+#define CONTENT_CHILD_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
@@ -33,4 +33,4 @@ class WebBlobRegistryImpl : public WebKit::WebBlobRegistry {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
+#endif  // CONTENT_CHILD_FILEAPI_WEBBLOBREGISTRY_IMPL_H_
diff --git a/content/common/DEPS b/content/common/DEPS
index 11a3ffc..f2d5ebd 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -10,6 +10,6 @@ include_rules = [
 specific_include_rules = {
 # Java bridge code passes NPAPI types to the browser process. Crazy!
   "java_bridge_messages\.h": [
-    "+content/common_child"
+    "+content/child"
   ]
 }
diff --git a/content/common/java_bridge_messages.h b/content/common/java_bridge_messages.h
index 804c572..f6aa48f 100644
--- a/content/common/java_bridge_messages.h
+++ b/content/common/java_bridge_messages.h
@@ -8,7 +8,7 @@
 
 #if defined(ENABLE_JAVA_BRIDGE)
 
-#include "content/common_child/plugin_param_traits.h"
+#include "content/child/plugin_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 
diff --git a/content/content.gyp b/content/content.gyp
index f78d372..7499e9b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -48,7 +48,7 @@
           'dependencies': [
             'content_app',
             'content_browser',
-            'content_common_child',
+            'content_child',
             'content_common',
           ],
           'conditions': [
@@ -100,7 +100,7 @@
             }],
             ['java_bridge==1', {
               'dependencies': [
-                'content_common_child',
+                'content_child',
               ]
             }]
           ],
@@ -123,11 +123,11 @@
           'msvs_disabled_warnings': [ 4267, ],
         },
         {
-          'target_name': 'content_common_child',
+          'target_name': 'content_child',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'includes': [
-            'content_common_child.gypi',
+            'content_child.gypi',
           ],
           'conditions': [
             ['OS != "ios"', {
@@ -163,7 +163,7 @@
                 'content_plugin.gypi',
               ],
               'dependencies': [
-                'content_common_child',
+                'content_child',
                 'content_common',
               ],
             },
@@ -185,7 +185,7 @@
                 'content_renderer.gypi',
               ],
               'dependencies': [
-                'content_common_child',
+                'content_child',
                 'content_common',
                 'content_resources.gyp:content_resources',
               ],
@@ -216,7 +216,7 @@
                 'content_worker.gypi',
               ],
               'dependencies': [
-                'content_common_child',
+                'content_child',
                 'content_common',
               ],
             },
@@ -248,7 +248,7 @@
           'includes': [
             'content_app.gypi',
             'content_browser.gypi',
-            'content_common_child.gypi',
+            'content_child.gypi',
             'content_common.gypi',
             'content_gpu.gypi',
             'content_plugin.gypi',
@@ -285,7 +285,7 @@
           'msvs_disabled_warnings': [ 4267, ],
         },
         {
-          'target_name': 'content_common_child',
+          'target_name': 'content_child',
           'type': 'none',
           'dependencies': ['content'],
         },
diff --git a/content/content_child.gypi b/content/content_child.gypi
new file mode 100644
index 0000000..a66987e
--- /dev/null
+++ b/content/content_child.gypi
@@ -0,0 +1,70 @@
+# 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.
+
+{
+  'dependencies': [
+    '../base/base.gyp:base',
+    '../components/tracing.gyp:tracing',
+    '../ui/ui.gyp:ui',
+    '../url/url.gyp:url_lib',
+  ],
+  'include_dirs': [
+    '..',
+  ],
+  'export_dependent_settings': [
+    '../base/base.gyp:base',
+  ],
+  'sources': [
+    'child/fileapi/webfilesystem_callback_adapters.cc',
+    'child/fileapi/webfilesystem_callback_adapters.h',
+    'child/fileapi/webfilesystem_impl.cc',
+    'child/fileapi/webfilesystem_impl.h',
+    'child/fileapi/webfilewriter_impl.cc',
+    'child/fileapi/webfilewriter_impl.h',
+    'child/indexed_db/indexed_db_dispatcher.cc',
+    'child/indexed_db/indexed_db_dispatcher.h',
+    'child/indexed_db/indexed_db_message_filter.cc',
+    'child/indexed_db/indexed_db_message_filter.h',
+    'child/indexed_db/proxy_webidbcursor_impl.cc',
+    'child/indexed_db/proxy_webidbcursor_impl.h',
+    'child/indexed_db/proxy_webidbdatabase_impl.cc',
+    'child/indexed_db/proxy_webidbdatabase_impl.h',
+    'child/indexed_db/proxy_webidbfactory_impl.cc',
+    'child/indexed_db/proxy_webidbfactory_impl.h',
+    'child/np_channel_base.cc',
+    'child/np_channel_base.h',
+    'child/npobject_base.h',
+    'child/npobject_proxy.cc',
+    'child/npobject_proxy.h',
+    'child/npobject_stub.cc',
+    'child/npobject_stub.h',
+    'child/npobject_util.cc',
+    'child/npobject_util.h',
+    'child/plugin_message_generator.cc',
+    'child/plugin_message_generator.h',
+    'child/plugin_messages.h',
+    'child/plugin_param_traits.cc',
+    'child/plugin_param_traits.h',
+    'child/web_database_observer_impl.cc',
+    'child/web_database_observer_impl.h',
+    'child/webblobregistry_impl.cc',
+    'child/webblobregistry_impl.h',
+  ],
+  'conditions': [
+    ['OS=="ios"', {
+      'sources/': [
+        # iOS only needs a small portion of content; exclude all the
+        # implementation, and re-include what is used.
+        ['exclude', '\\.(cc|mm)$'],
+      ],
+    }, {  # OS!="ios"
+      'dependencies': [
+        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '../third_party/npapi/npapi.gyp:npapi',
+        '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/support/webkit_support.gyp:webkit_base',
+      ],
+    }],
+  ],
+}
diff --git a/content/content_common_child.gypi b/content/content_common_child.gypi
deleted file mode 100644
index 6461a99..0000000
--- a/content/content_common_child.gypi
+++ /dev/null
@@ -1,70 +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.
-
-{
-  'dependencies': [
-    '../base/base.gyp:base',
-    '../components/tracing.gyp:tracing',
-    '../ui/ui.gyp:ui',
-    '../url/url.gyp:url_lib',
-  ],
-  'include_dirs': [
-    '..',
-  ],
-  'export_dependent_settings': [
-    '../base/base.gyp:base',
-  ],
-  'sources': [
-    'common_child/fileapi/webfilesystem_callback_adapters.cc',
-    'common_child/fileapi/webfilesystem_callback_adapters.h',
-    'common_child/fileapi/webfilesystem_impl.cc',
-    'common_child/fileapi/webfilesystem_impl.h',
-    'common_child/fileapi/webfilewriter_impl.cc',
-    'common_child/fileapi/webfilewriter_impl.h',
-    'common_child/indexed_db/indexed_db_dispatcher.cc',
-    'common_child/indexed_db/indexed_db_dispatcher.h',
-    'common_child/indexed_db/indexed_db_message_filter.cc',
-    'common_child/indexed_db/indexed_db_message_filter.h',
-    'common_child/indexed_db/proxy_webidbcursor_impl.cc',
-    'common_child/indexed_db/proxy_webidbcursor_impl.h',
-    'common_child/indexed_db/proxy_webidbdatabase_impl.cc',
-    'common_child/indexed_db/proxy_webidbdatabase_impl.h',
-    'common_child/indexed_db/proxy_webidbfactory_impl.cc',
-    'common_child/indexed_db/proxy_webidbfactory_impl.h',
-    'common_child/np_channel_base.cc',
-    'common_child/np_channel_base.h',
-    'common_child/npobject_base.h',
-    'common_child/npobject_proxy.cc',
-    'common_child/npobject_proxy.h',
-    'common_child/npobject_stub.cc',
-    'common_child/npobject_stub.h',
-    'common_child/npobject_util.cc',
-    'common_child/npobject_util.h',
-    'common_child/plugin_message_generator.cc',
-    'common_child/plugin_message_generator.h',
-    'common_child/plugin_messages.h',
-    'common_child/plugin_param_traits.cc',
-    'common_child/plugin_param_traits.h',
-    'common_child/web_database_observer_impl.cc',
-    'common_child/web_database_observer_impl.h',
-    'common_child/webblobregistry_impl.cc',
-    'common_child/webblobregistry_impl.h',
-  ],
-  'conditions': [
-    ['OS=="ios"', {
-      'sources/': [
-        # iOS only needs a small portion of content; exclude all the
-        # implementation, and re-include what is used.
-        ['exclude', '\\.(cc|mm)$'],
-      ],
-    }, {  # OS!="ios"
-      'dependencies': [
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/support/webkit_support.gyp:glue',
-        '../webkit/support/webkit_support.gyp:webkit_base',
-      ],
-    }],
-  ],
-}
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ec797c0..2cdb9ad 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -377,8 +377,8 @@
         'common/sandbox_mac_system_access_unittest.mm',
         'common/sandbox_mac_unittest_helper.h',
         'common/sandbox_mac_unittest_helper.mm',
-        'common_child/indexed_db/indexed_db_dispatcher_unittest.cc',
-        'common_child/indexed_db/proxy_webidbcursor_impl_unittest.cc',
+        'child/indexed_db/indexed_db_dispatcher_unittest.cc',
+        'child/indexed_db/proxy_webidbcursor_impl_unittest.cc',
         'renderer/active_notification_tracker_unittest.cc',
         'renderer/android/email_detector_unittest.cc',
         'renderer/android/phone_number_detector_unittest.cc',
diff --git a/content/plugin/DEPS b/content/plugin/DEPS
index 90fcc14..71cb2f3 100644
--- a/content/plugin/DEPS
+++ b/content/plugin/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "-chrome",
   "+content/public/plugin",
-  "+content/common_child",
+  "+content/child",
   "+sandbox/win/src",
   "+skia/ext",
   "+third_party/npapi",
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index 8c0321f..cf20c3c 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -11,13 +11,13 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
+#include "content/child/plugin_messages.h"
 #include "content/common/child_process.h"
 #include "content/common/plugin_process_messages.h"
-#include "content/common_child/plugin_messages.h"
-#include "content/public/common/content_switches.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_delegate_stub.h"
 #include "content/plugin/webplugin_proxy.h"
+#include "content/public/common/content_switches.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 
 #if defined(OS_POSIX)
diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index 70b36b7..7860a17 100644
--- a/content/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_handle.h"
 #include "base/process.h"
 #include "build/build_config.h"
-#include "content/common_child/np_channel_base.h"
+#include "content/child/np_channel_base.h"
 #include "content/plugin/webplugin_delegate_stub.h"
 
 namespace base {
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 0be9a91..fdb46b5 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -20,9 +20,9 @@
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
+#include "content/child/npobject_util.h"
 #include "content/common/child_process.h"
 #include "content/common/plugin_process_messages.h"
-#include "content/common_child/npobject_util.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/plugin/content_plugin_client.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 023861d..16bec47 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -9,18 +9,18 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
-#include "content/common_child/plugin_messages.h"
+#include "content/child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_proxy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
-#include "third_party/npapi/bindings/npapi.h"
-#include "third_party/npapi/bindings/npruntime.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #include "webkit/common/cursors/webcursor.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index b8a2a66..7bdfd8b 100644
--- a/content/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/common_child/npobject_stub.h"
+#include "content/child/npobject_stub.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 5817060..3705611 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -11,9 +11,9 @@
 #include "base/memory/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
-#include "content/common_child/npobject_proxy.h"
-#include "content/common_child/npobject_util.h"
-#include "content/common_child/plugin_messages.h"
+#include "content/child/npobject_proxy.h"
+#include "content/child/npobject_util.h"
+#include "content/child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_client.h"
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index 664ad70..2da21ae 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+content/public/renderer",
-  "+content/common_child",
+  "+content/child",
   "+jingle/glue",
   "+media",  # For audio input/output and audio/video decoding.
   "+third_party/hyphen/hyphen.h",
diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc
index c783c92..fa4533e 100644
--- a/content/renderer/java/java_bridge_channel.cc
+++ b/content/renderer/java/java_bridge_channel.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/java/java_bridge_channel.h"
 
+#include "content/child/plugin_messages.h"
 #include "content/common/child_process.h"
 #include "content/common/java_bridge_messages.h"
-#include "content/common_child/plugin_messages.h"
 
 namespace content {
 
diff --git a/content/renderer/java/java_bridge_channel.h b/content/renderer/java/java_bridge_channel.h
index 0dd2e5a..dbedceec 100644
--- a/content/renderer/java/java_bridge_channel.h
+++ b/content/renderer/java/java_bridge_channel.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_
 #define CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_
 
-#include "content/common_child/np_channel_base.h"
+#include "content/child/np_channel_base.h"
 #include "ipc/ipc_channel_handle.h"
 
 namespace content {
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc
index 6a659c5..ffab104 100644
--- a/content/renderer/java/java_bridge_dispatcher.cc
+++ b/content/renderer/java/java_bridge_dispatcher.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/java/java_bridge_dispatcher.h"
 
+#include "content/child/npobject_util.h"  // For CreateNPVariant()
 #include "content/common/child_process.h"
 #include "content/common/java_bridge_messages.h"
-#include "content/common_child/npobject_util.h"  // For CreateNPVariant()
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/java/java_bridge_channel.h"
diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc
index 118dc5e..ba2e81c 100644
--- a/content/renderer/plugin_channel_host.cc
+++ b/content/renderer/plugin_channel_host.cc
@@ -6,9 +6,9 @@
 
 #include "base/metrics/histogram.h"
 #include "base/time.h"
+#include "content/child/npobject_base.h"
+#include "content/child/plugin_messages.h"
 #include "content/common/child_process.h"
-#include "content/common_child/npobject_base.h"
-#include "content/common_child/plugin_messages.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
diff --git a/content/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h
index b91f6d5..bf5feb4 100644
--- a/content/renderer/plugin_channel_host.h
+++ b/content/renderer/plugin_channel_host.h
@@ -6,7 +6,7 @@
 #define CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_
 
 #include "base/hash_tables.h"
-#include "content/common_child/np_channel_base.h"
+#include "content/child/np_channel_base.h"
 #include "ipc/ipc_channel_handle.h"
 
 namespace content {
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index a8e82f2..dc2e968 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -25,6 +25,11 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "content/child/indexed_db/indexed_db_dispatcher.h"
+#include "content/child/indexed_db/indexed_db_message_filter.h"
+#include "content/child/npobject_util.h"
+#include "content/child/plugin_messages.h"
+#include "content/child/web_database_observer_impl.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/child_histogram_message_filter.h"
 #include "content/common/child_process_messages.h"
@@ -37,11 +42,6 @@
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
-#include "content/common_child/indexed_db/indexed_db_dispatcher.h"
-#include "content/common_child/indexed_db/indexed_db_message_filter.h"
-#include "content/common_child/npobject_util.h"
-#include "content/common_child/plugin_messages.h"
-#include "content/common_child/web_database_observer_impl.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
@@ -80,7 +80,6 @@
 #include "media/base/media.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -93,6 +92,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_base_switches.h"
 #include "v8/include/v8.h"
@@ -105,7 +105,7 @@
 #else
 // TODO(port)
 #include "base/memory/scoped_handle.h"
-#include "content/common_child/np_channel_base.h"
+#include "content/child/np_channel_base.h"
 #endif
 
 #if defined(OS_POSIX)
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 014f4a5..c7cd9fb 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -27,6 +27,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "content/child/fileapi/webfilesystem_callback_adapters.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/child_thread.h"
 #include "content/common/clipboard_messages.h"
@@ -44,7 +45,6 @@
 #include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
 #include "content/common/webmessageportchannel_impl.h"
-#include "content/common_child/fileapi/webfilesystem_callback_adapters.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
@@ -131,22 +131,6 @@
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_util.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
-#include "third_party/WebKit/public/platform/WebDragData.h"
-#include "third_party/WebKit/public/platform/WebFileSystemType.h"
-#include "third_party/WebKit/public/platform/WebHTTPBody.h"
-#include "third_party/WebKit/public/platform/WebImage.h"
-#include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
-#include "third_party/WebKit/public/platform/WebPoint.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
-#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/platform/WebURLError.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h"
@@ -189,6 +173,22 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h"
+#include "third_party/WebKit/public/platform/WebCString.h"
+#include "third_party/WebKit/public/platform/WebDragData.h"
+#include "third_party/WebKit/public/platform/WebFileSystemType.h"
+#include "third_party/WebKit/public/platform/WebHTTPBody.h"
+#include "third_party/WebKit/public/platform/WebImage.h"
+#include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
+#include "third_party/WebKit/public/platform/WebPoint.h"
+#include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
+#include "third_party/WebKit/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/base/ui_base_switches_util.h"
@@ -226,9 +226,9 @@
 #include "content/renderer/android/phone_number_detector.h"
 #include "content/renderer/media/stream_texture_factory_impl_android.h"
 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
 #include "ui/gfx/rect_f.h"
 #include "webkit/renderer/media/android/webmediaplayer_android.h"
 #include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 557c61a..1e189dc 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -12,6 +12,10 @@
 #include "base/shared_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "content/child/fileapi/webfilesystem_impl.h"
+#include "content/child/indexed_db/proxy_webidbfactory_impl.h"
+#include "content/child/npobject_util.h"
+#include "content/child/webblobregistry_impl.h"
 #include "content/common/database_util.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
@@ -20,10 +24,6 @@
 #include "content/common/thread_safe_sender.h"
 #include "content/common/view_messages.h"
 #include "content/common/webmessageportchannel_impl.h"
-#include "content/common_child/fileapi/webfilesystem_impl.h"
-#include "content/common_child/indexed_db/proxy_webidbfactory_impl.h"
-#include "content/common_child/npobject_util.h"
-#include "content/common_child/webblobregistry_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
@@ -39,6 +39,8 @@
 #include "ipc/ipc_sync_message_filter.h"
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_hardware_config.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
@@ -47,8 +49,6 @@
 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h"
 #include "webkit/glue/simple_webmimeregistry_impl.h"
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 51bf987..6ec5189 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -24,12 +24,12 @@
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
+#include "content/child/npobject_proxy.h"
+#include "content/child/npobject_stub.h"
+#include "content/child/npobject_util.h"
+#include "content/child/plugin_messages.h"
 #include "content/common/child_process.h"
 #include "content/common/view_messages.h"
-#include "content/common_child/npobject_proxy.h"
-#include "content/common_child/npobject_stub.h"
-#include "content/common_child/npobject_util.h"
-#include "content/common_child/plugin_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_thread_impl.h"
@@ -37,12 +37,12 @@
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/platform/WebDragData.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebDragData.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "ui/gfx/blit.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/content/worker/DEPS b/content/worker/DEPS
index fe035fa..34e8b17 100644
--- a/content/worker/DEPS
+++ b/content/worker/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+content/common_child",
+  "+content/child",
   "+sandbox/win/src",
   "+webkit/appcache",
   "+webkit/glue",
diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc
index 38e5183..201b76f 100644
--- a/content/worker/websharedworkerclient_proxy.cc
+++ b/content/worker/websharedworkerclient_proxy.cc
@@ -7,23 +7,23 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
+#include "content/child/fileapi/webfilesystem_callback_adapters.h"
 #include "content/common/fileapi/file_system_dispatcher.h"
 #include "content/common/quota_dispatcher.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
-#include "content/common_child/fileapi/webfilesystem_callback_adapters.h"
 #include "content/public/common/content_switches.h"
 #include "content/worker/shared_worker_devtools_agent.h"
 #include "content/worker/websharedworker_stub.h"
 #include "content/worker/worker_thread.h"
 #include "content/worker/worker_webapplicationcachehost_impl.h"
 #include "ipc/ipc_logging.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebURL.h"
 
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebFrame;
diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc
index b81d8b7..fa14b41 100644
--- a/content/worker/worker_thread.cc
+++ b/content/worker/worker_thread.cc
@@ -7,19 +7,19 @@
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
+#include "content/child/indexed_db/indexed_db_message_filter.h"
+#include "content/child/web_database_observer_impl.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/db_message_filter.h"
 #include "content/common/worker_messages.h"
-#include "content/common_child/indexed_db/indexed_db_message_filter.h"
-#include "content/common_child/web_database_observer_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/worker/websharedworker_stub.h"
 #include "content/worker/worker_webkitplatformsupport_impl.h"
 #include "ipc/ipc_sync_channel.h"
-#include "third_party/WebKit/public/platform/WebBlobRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
+#include "third_party/WebKit/public/platform/WebBlobRegistry.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebRuntimeFeatures;
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index b5df064..7bcfcac 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -7,14 +7,14 @@
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/utf_string_conversions.h"
+#include "content/child/fileapi/webfilesystem_impl.h"
+#include "content/child/indexed_db/proxy_webidbfactory_impl.h"
+#include "content/child/webblobregistry_impl.h"
 #include "content/common/database_util.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/thread_safe_sender.h"
 #include "content/common/webmessageportchannel_impl.h"
-#include "content/common_child/fileapi/webfilesystem_impl.h"
-#include "content/common_child/indexed_db/proxy_webidbfactory_impl.h"
-#include "content/common_child/webblobregistry_impl.h"
 #include "content/worker/worker_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "net/base/mime_util.h"