14 files changed, 26 insertions, 29 deletions
diff --git a/chrome/renderer/media/cast_session_delegate.cc b/chrome/renderer/media/cast_session_delegate.cc
index faab4f9..d99d70f 100644
--- a/chrome/renderer/media/cast_session_delegate.cc
+++ b/chrome/renderer/media/cast_session_delegate.cc
@@ -9,7 +9,6 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/renderer/media/cast_threads.h"
 #include "chrome/renderer/media/cast_transport_sender_ipc.h"
-#include "content/public/renderer/p2p_socket_client.h"
 #include "content/public/renderer/render_thread.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.h b/content/browser/renderer_host/p2p/socket_dispatcher_host.h
index 47958ee..1b35857 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.h
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.h
@@ -11,9 +11,9 @@
 #include <vector>
 
 #include "content/browser/renderer_host/p2p/socket_host_throttler.h"
+#include "content/common/p2p_socket_type.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/network_change_notifier.h"
 
diff --git a/content/browser/renderer_host/p2p/socket_host.h b/content/browser/renderer_host/p2p/socket_host.h
index 40dc713f..24e49bd 100644
--- a/content/browser/renderer_host/p2p/socket_host.h
+++ b/content/browser/renderer_host/p2p/socket_host.h
@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_H_
 
 #include "content/common/content_export.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/datagram_socket.h"
 
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h
index 16a0b91..38a886c 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "net/base/completion_callback.h"
 #include "net/base/ip_endpoint.h"
 
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
index 5e43439..51c649f 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
@@ -13,7 +13,7 @@
 #include "base/message_loop/message_loop.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/content_export.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "ipc/ipc_sender.h"
 #include "net/base/completion_callback.h"
 #include "net/socket/tcp_server_socket.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
index e5a2638..7c8bbb2 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.h
+++ b/content/browser/renderer_host/p2p/socket_host_udp.h
@@ -15,7 +15,7 @@
 #include "base/message_loop/message_loop.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/content_export.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/udp_server_socket.h"
 
diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h
index 814adc1..f221544 100644
--- a/content/common/p2p_messages.h
+++ b/content/common/p2p_messages.h
@@ -7,7 +7,7 @@
 
 #include "base/time/time.h"
 #include "content/common/content_export.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
diff --git a/content/public/common/p2p_socket_type.h b/content/common/p2p_socket_type.h
index 10e7508..1dfe059 100644
--- a/content/public/common/p2p_socket_type.h
+++ b/content/common/p2p_socket_type.h
@@ -1,12 +1,12 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines some basic types used by the P2P-related IPC
 // messages.
 
-#ifndef CONTENT_PUBLIC_COMMON_P2P_SOCKET_TYPE_H_
-#define CONTENT_PUBLIC_COMMON_P2P_SOCKET_TYPE_H_
+#ifndef CONTENT_COMMON_P2P_SOCKET_TYPE_H_
+#define CONTENT_COMMON_P2P_SOCKET_TYPE_H_
 
 namespace content {
 
@@ -33,4 +33,4 @@ enum P2PSocketType {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_COMMON_P2P_SOCKET_TYPE_H_
+#endif  // CONTENT_COMMON_P2P_SOCKET_TYPE_H_
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 16e2641..cb4f436 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -11,8 +11,8 @@
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "content/public/renderer/p2p_socket_client_delegate.h"
 #include "content/renderer/p2p/host_address_request.h"
+#include "content/renderer/p2p/socket_client_delegate.h"
 #include "content/renderer/p2p/socket_client_impl.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "jingle/glue/utils.h"
diff --git a/content/public/renderer/p2p_socket_client.h b/content/renderer/p2p/socket_client.h
index be3f78a..eb2bf7a 100644
--- a/content/public/renderer/p2p_socket_client.h
+++ b/content/renderer/p2p/socket_client.h
@@ -1,15 +1,14 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_RENDERER_P2P_SOCKET_CLIENT_H_
-#define CONTENT_PUBLIC_RENDERER_P2P_SOCKET_CLIENT_H_
+#ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
+#define CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/common/content_export.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 
 namespace content {
@@ -19,8 +18,7 @@ class P2PSocketClientDelegate;
 // P2P socket that routes all calls over IPC.
 // Note that while ref-counting is thread-safe, all methods must be
 // called on the same thread.
-class CONTENT_EXPORT P2PSocketClient :
-      public base::RefCountedThreadSafe<P2PSocketClient> {
+class P2PSocketClient : public base::RefCountedThreadSafe<P2PSocketClient> {
  public:
   // Create a new P2PSocketClient() of the specified |type| and connected to
   // the specified |address|. |address| matters only when |type| is set to
@@ -61,4 +59,4 @@ class CONTENT_EXPORT P2PSocketClient :
 };
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_RENDERER_P2P_SOCKET_CLIENT_H_
+#endif  // CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_
diff --git a/content/public/renderer/p2p_socket_client_delegate.h b/content/renderer/p2p/socket_client_delegate.h
index 6b2a731..c379463 100644
--- a/content/public/renderer/p2p_socket_client_delegate.h
+++ b/content/renderer/p2p/socket_client_delegate.h
@@ -1,14 +1,14 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_RENDERER_P2P_SOCKET_CLIENT_DELEGATE_H_
-#define CONTENT_PUBLIC_RENDERER_P2P_SOCKET_CLIENT_DELEGATE_H_
+#ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_DELEGATE_H_
+#define CONTENT_RENDERER_P2P_SOCKET_CLIENT_DELEGATE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 
 namespace content {
@@ -43,4 +43,4 @@ class P2PSocketClientDelegate {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_RENDERER_P2P_SOCKET_CLIENT_DELEGATE_H_
+#endif  // CONTENT_RENDERER_P2P_SOCKET_CLIENT_DELEGATE_H_
diff --git a/content/renderer/p2p/socket_client_impl.cc b/content/renderer/p2p/socket_client_impl.cc
index 063c785..5e01ff2 100644
--- a/content/renderer/p2p/socket_client_impl.cc
+++ b/content/renderer/p2p/socket_client_impl.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/p2p_messages.h"
-#include "content/public/renderer/p2p_socket_client_delegate.h"
+#include "content/renderer/p2p/socket_client_delegate.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/render_thread_impl.h"
 #include "crypto/random.h"
diff --git a/content/renderer/p2p/socket_client_impl.h b/content/renderer/p2p/socket_client_impl.h
index fd996be..32a750b 100644
--- a/content/renderer/p2p/socket_client_impl.h
+++ b/content/renderer/p2p/socket_client_impl.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "content/public/common/p2p_socket_type.h"
-#include "content/public/renderer/p2p_socket_client.h"
+#include "content/common/p2p_socket_type.h"
+#include "content/renderer/p2p/socket_client.h"
 #include "net/base/ip_endpoint.h"
 
 namespace base {
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 959f850..5709e93 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -29,7 +29,7 @@
 #include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
-#include "content/public/common/p2p_socket_type.h"
+#include "content/common/p2p_socket_type.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "net/base/net_util.h"