Add DEPS files in remoting subdirectories.

This is to avoid unwanted dependencies between remoting modules. Also
fixed libjingle includes to use full path, and removed some old
includes.

TEST=checkdeps
BUG=None

Review URL: http://codereview.chromium.org/4562002

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

14 files changed, 51 insertions, 31 deletions

diff --git a/remoting/DEPS b/remoting/DEPS
index fbdd04d..c4ae789 100644
--- a/remoting/DEPS
+++ b/remoting/DEPS
@@ -1,13 +1,7 @@
 include_rules = [
-  "+app",
-  "+gfx",
-  "+google/protobuf",
   "+media/base",
-  "+net",
-  "+jingle",
-  "+ppapi",
-  "+talk",
-  "+third_party/npapi"
-  "+third_party/protobuf2",
-  "+third_party/zlib",
+
+  "-remoting",
+  "+remoting/base",
+  "+remoting/proto",
 ]
diff --git a/remoting/base/DEPS b/remoting/base/DEPS
new file mode 100644
index 0000000..b375023
--- /dev/null
+++ b/remoting/base/DEPS
@@ -0,0 +1,6 @@
+include_rules = [
+  "+gfx",
+  "+google/protobuf",
+  "+net",
+  "+third_party/zlib",
+]
diff --git a/remoting/base/decoder_vp8_unittest.cc b/remoting/base/decoder_vp8_unittest.cc
index 25ff6ac..4cdb573 100644
--- a/remoting/base/decoder_vp8_unittest.cc
+++ b/remoting/base/decoder_vp8_unittest.cc
@@ -6,10 +6,8 @@
 #include "remoting/base/codec_test.h"
 #include "remoting/base/decoder_vp8.h"
 #include "remoting/base/encoder_vp8.h"
-#include "remoting/client/mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-
 namespace remoting {
 
 TEST(DecoderVp8Test, EncodeAndDecode) {
diff --git a/remoting/base/encode_decode_unittest.cc b/remoting/base/encode_decode_unittest.cc
index f1357fa..4e859a6 100644
--- a/remoting/base/encode_decode_unittest.cc
+++ b/remoting/base/encode_decode_unittest.cc
@@ -6,7 +6,6 @@
 #include "remoting/base/codec_test.h"
 #include "remoting/base/decoder_row_based.h"
 #include "remoting/base/encoder_zlib.h"
-#include "remoting/client/mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
diff --git a/remoting/client/DEPS b/remoting/client/DEPS
new file mode 100644
index 0000000..c543943
--- /dev/null
+++ b/remoting/client/DEPS
@@ -0,0 +1,8 @@
+include_rules = [
+  "+gfx",
+  "+ppapi",
+  "+third_party/npapi",
+
+  "+remoting/protocol",
+  "+remoting/jingle_glue",
+]
diff --git a/remoting/host/DEPS b/remoting/host/DEPS
new file mode 100644
index 0000000..8d94267
--- /dev/null
+++ b/remoting/host/DEPS
@@ -0,0 +1,7 @@
+include_rules = [
+  "+app",
+  "+gfx",
+
+  "+remoting/protocol",
+  "+remoting/jingle_glue",
+]
diff --git a/remoting/jingle_glue/DEPS b/remoting/jingle_glue/DEPS
new file mode 100644
index 0000000..e8dddf8
--- /dev/null
+++ b/remoting/jingle_glue/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  "+net",
+  "+jingle",
+  "+third_party/libjingle/source",
+]
diff --git a/remoting/jingle_glue/ssl_adapter.cc b/remoting/jingle_glue/ssl_adapter.cc
index 68d350c..25cd75a 100644
--- a/remoting/jingle_glue/ssl_adapter.cc
+++ b/remoting/jingle_glue/ssl_adapter.cc
@@ -5,7 +5,7 @@
 #include "remoting/jingle_glue/ssl_adapter.h"
 
 #if defined(OS_WIN)
-#include "talk/base/ssladapter.h"
+#include "third_party/libjingle/source/talk/base/ssladapter.h"
 #else
 #include "remoting/jingle_glue/ssl_socket_adapter.h"
 #endif
@@ -24,4 +24,3 @@ talk_base::SSLAdapter* CreateSSLAdapter(talk_base::AsyncSocket* socket) {
 }
 
 }  // namespace remoting
-
diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h
index 9191fa0..2843bda 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.h
+++ b/remoting/jingle_glue/ssl_socket_adapter.h
@@ -12,8 +12,8 @@
 #include "net/base/net_log.h"
 #include "net/socket/client_socket.h"
 #include "net/socket/ssl_client_socket.h"
-#include "talk/base/asyncsocket.h"
-#include "talk/base/ssladapter.h"
+#include "third_party/libjingle/source/talk/base/asyncsocket.h"
+#include "third_party/libjingle/source/talk/base/ssladapter.h"
 
 namespace remoting {
 
diff --git a/remoting/jingle_glue/xmpp_socket_adapter.cc b/remoting/jingle_glue/xmpp_socket_adapter.cc
index 88bdf97..c4a669a 100644
--- a/remoting/jingle_glue/xmpp_socket_adapter.cc
+++ b/remoting/jingle_glue/xmpp_socket_adapter.cc
@@ -9,14 +9,14 @@
 
 #include "base/logging.h"
 #include "remoting/jingle_glue/ssl_adapter.h"
-#include "talk/base/byteorder.h"
-#include "talk/base/common.h"
-#include "talk/base/firewallsocketserver.h"
-#include "talk/base/logging.h"
-#include "talk/base/socketadapters.h"
-#include "talk/base/ssladapter.h"
-#include "talk/base/thread.h"
-#include "talk/xmpp/xmppengine.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
+#include "third_party/libjingle/source/talk/base/common.h"
+#include "third_party/libjingle/source/talk/base/firewallsocketserver.h"
+#include "third_party/libjingle/source/talk/base/logging.h"
+#include "third_party/libjingle/source/talk/base/socketadapters.h"
+#include "third_party/libjingle/source/talk/base/ssladapter.h"
+#include "third_party/libjingle/source/talk/base/thread.h"
+#include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
 
 namespace remoting {
 
diff --git a/remoting/jingle_glue/xmpp_socket_adapter.h b/remoting/jingle_glue/xmpp_socket_adapter.h
index d1a6f65..18376b1 100644
--- a/remoting/jingle_glue/xmpp_socket_adapter.h
+++ b/remoting/jingle_glue/xmpp_socket_adapter.h
@@ -7,10 +7,10 @@
 
 #include <string>
 
-#include "talk/base/asyncsocket.h"
-#include "talk/xmpp/asyncsocket.h"
-#include "talk/xmpp/xmppclientsettings.h"
-#include "talk/xmpp/xmppengine.h"
+#include "third_party/libjingle/source/talk/base/asyncsocket.h"
+#include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
+#include "third_party/libjingle/source/talk/xmpp/xmppclientsettings.h"
+#include "third_party/libjingle/source/talk/xmpp/xmppengine.h"
 
 #ifndef _WIN32
 // Additional errors used by us from Win32 headers.
diff --git a/remoting/protocol/DEPS b/remoting/protocol/DEPS
new file mode 100644
index 0000000..a8f50ba
--- /dev/null
+++ b/remoting/protocol/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  "+google/protobuf",
+  "+remoting/jingle_glue",
+  "+net",
+]
diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc
index 45b9143..e199c12 100644
--- a/remoting/protocol/connection_to_client_unittest.cc
+++ b/remoting/protocol/connection_to_client_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/message_loop.h"
 #include "remoting/base/mock_objects.h"
-#include "remoting/host/mock_objects.h"
 #include "remoting/protocol/fake_session.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/mock_objects.h"
diff --git a/remoting/protocol/message_decoder.cc b/remoting/protocol/message_decoder.cc
index b82eb04..1200120 100644
--- a/remoting/protocol/message_decoder.cc
+++ b/remoting/protocol/message_decoder.cc
@@ -8,7 +8,7 @@
 #include "net/base/io_buffer.h"
 #include "remoting/base/multiple_array_input_stream.h"
 #include "remoting/proto/internal.pb.h"
-#include "talk/base/byteorder.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
 
 namespace remoting {