6 files changed, 25 insertions, 26 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 6214c4d..62be61d 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -11,7 +11,6 @@
       'dependencies': [
         'some.gyp:*',
         '../base/base.gyp:*',
-        '../chrome/browser/sync/tools/sync_tools.gyp:*',
         '../chrome/chrome.gyp:*',
         '../content/content.gyp:*',
         '../crypto/crypto.gyp:*',
diff --git a/chrome/browser/sync/tools/DEPS b/chrome/browser/sync/tools/DEPS
deleted file mode 100644
index c5196b79..0000000
--- a/chrome/browser/sync/tools/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+jingle/notifier/base",
-  "+sync/notifier",
-]
diff --git a/chrome/browser/sync/tools/sync_tools.gyp b/chrome/browser/sync/tools/sync_tools.gyp
deleted file mode 100644
index a9110f7..0000000
--- a/chrome/browser/sync/tools/sync_tools.gyp
+++ /dev/null
@@ -1,21 +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.
-
-{
-  'targets': [
-    {
-      'target_name': 'sync_listen_notifications',
-      'type': 'executable',
-      'sources': [
-        'sync_listen_notifications.cc',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/net/net.gyp:net_test_support',
-        '<(DEPTH)/sync/sync.gyp:sync_notifier',
-      ],
-    },
-  ],
-}
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 69221e3..cc4d83d 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -482,5 +482,22 @@
         }],
       ],
     },
+
+    # A tool to listen to sync notifications and print them out.
+    {
+      'target_name': 'sync_listen_notifications',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../jingle/jingle.gyp:notifier',
+        '../net/net.gyp:net',
+        '../net/net.gyp:net_test_support',
+        'sync',
+        'sync_notifier',
+      ],
+      'sources': [
+        'tools/sync_listen_notifications.cc',
+      ],
+    },
   ],
 }
diff --git a/sync/tools/DEPS b/sync/tools/DEPS
new file mode 100644
index 0000000..befcabe
--- /dev/null
+++ b/sync/tools/DEPS
@@ -0,0 +1,8 @@
+include_rules = [
+  "+jingle/notifier/base",
+  "+net/base/host_port_pair.h",
+  "+net/url_request/url_request_test_util.h",
+  "+sync/notifier",
+  "+sync/syncable/model_type.h",
+  "+sync/syncable/model_type_payload_map.h",
+]
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 7b38c0c..7b38c0c 100644
--- a/chrome/browser/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc