73 files changed, 365 insertions, 338 deletions

diff --git a/build/all.gyp b/build/all.gyp
index b19a518..bd34a33 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -17,6 +17,7 @@
         '../gpu/gpu.gyp:*',
         '../gpu/demos/demos.gyp:*',
         '../ipc/ipc.gyp:*',
+        '../jingle/jingle.gyp:*',
         '../media/media.gyp:*',
         '../net/net.gyp:*',
         '../net/third_party/nss/ssl.gyp:*',
@@ -153,18 +154,18 @@
           'type': 'none',
           'dependencies': [
             '../app/app.gyp:app_unittests',
-            '../gfx/gfx.gyp:gfx_unittests',
-            '../gpu/gpu.gyp:gpu_unittests',
-             '../ipc/ipc.gyp:ipc_tests',
-            '../media/media.gyp:media_unittests',
-            '../printing/printing.gyp:printing_unittests',
-            '../remoting/remoting.gyp:remoting_unittests',
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:nacl_ui_tests',
-            '../chrome/chrome.gyp:notifier_unit_tests',
             '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
+            '../gfx/gfx.gyp:gfx_unittests',
+            '../gpu/gpu.gyp:gpu_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:notifier_unit_tests',
+            '../media/media.gyp:media_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
@@ -177,7 +178,6 @@
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:memory_test',
             '../chrome/chrome.gyp:nacl_ui_tests',
-            '../chrome/chrome.gyp:notifier_unit_tests',
             '../chrome/chrome.gyp:page_cycler_tests',
             '../chrome/chrome.gyp:plugin_tests',
             '../chrome/chrome.gyp:startup_tests',
@@ -189,6 +189,7 @@
             '../gfx/gfx.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:media_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -202,9 +203,9 @@
           'dependencies': [
             '../base/base.gyp:base_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
-            '../chrome/chrome.gyp:notifier_unit_tests',
             '../net/net.gyp:net_unittests',
             '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:media_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -228,7 +229,6 @@
             '../chrome/chrome.gyp:memory_test',
             '../chrome/chrome.gyp:mini_installer_test',
             '../chrome/chrome.gyp:nacl_ui_tests',
-            '../chrome/chrome.gyp:notifier_unit_tests',
             '../chrome/chrome.gyp:page_cycler_tests',
             '../chrome/chrome.gyp:plugin_tests',
             '../chrome/chrome.gyp:selenium_tests',
@@ -246,6 +246,7 @@
             '../gfx/gfx.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:media_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -277,18 +278,18 @@
             # TODO(bradnelson): app_unittests should depend on locales.
             # However, we can't add dependencies on chrome/ to app/
             # See http://crbug.com/43603
-            '../chrome/app/locales/locales.gyp:*',
             '../base/base.gyp:base_unittests',
-            'temp_gyp/googleurl.gyp:googleurl_unittests',
-            '../net/net.gyp:net_unittests',
+            '../chrome/app/locales/locales.gyp:*',
+            '../chrome/chrome.gyp:sync_unit_tests',
+            '../chrome/chrome.gyp:unit_tests',
             '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:media_unittests',
+            '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
-            '../chrome/chrome.gyp:notifier_unit_tests',
-            '../chrome/chrome.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
-            '../chrome/chrome.gyp:unit_tests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         },
       ],  # targets
@@ -310,7 +311,6 @@
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:memory_test',
-            '../chrome/chrome.gyp:notifier_unit_tests',
             '../chrome/chrome.gyp:page_cycler_tests',
             '../chrome/chrome.gyp:startup_tests',
             '../chrome/chrome.gyp:sync_unit_tests',
@@ -320,6 +320,7 @@
             '../chrome/chrome.gyp:url_fetch_test',
             '../gfx/gfx.gyp:gfx_unittests',
             '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:ffmpeg_tests',
             '../media/media.gyp:media_unittests',
             '../media/media.gyp:omx_test',
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS
new file mode 100644
index 0000000..570fa48
--- /dev/null
+++ b/chrome/browser/sync/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  # sync_notifier depends on the common jingle notifier classes.
+  "+jingle/notifier",
+]
+
diff --git a/chrome/browser/sync/engine/all_status.cc b/chrome/browser/sync/engine/all_status.cc
index 73f80b9..6bf37d7 100644
--- a/chrome/browser/sync/engine/all_status.cc
+++ b/chrome/browser/sync/engine/all_status.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
-#include "chrome/common/net/notifier/listener/talk_mediator.h"
+#include "jingle/notifier/listener/talk_mediator.h"
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index 7d70ebe..1fbb4ed 100644
--- a/chrome/browser/sync/engine/syncapi.cc
+++ b/chrome/browser/sync/engine/syncapi.cc
@@ -54,10 +54,10 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/deprecated/event_sys.h"
 #include "chrome/common/net/gaia/gaia_authenticator.h"
-#include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
-#include "chrome/common/net/notifier/listener/notification_constants.h"
-#include "chrome/common/net/notifier/listener/talk_mediator.h"
-#include "chrome/common/net/notifier/listener/talk_mediator_impl.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/talk_mediator.h"
+#include "jingle/notifier/listener/talk_mediator_impl.h"
 #include "net/base/network_change_notifier.h"
 
 using browser_sync::AllStatus;
diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc
index 01f35f6..1437dfd 100644
--- a/chrome/browser/sync/engine/syncer_thread.cc
+++ b/chrome/browser/sync/engine/syncer_thread.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/net/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/notification_constants.h"
 
 using std::priority_queue;
 using std::min;
diff --git a/chrome/browser/sync/notifier/DEPS b/chrome/browser/sync/notifier/DEPS
index 5125416..dd31bd4 100644
--- a/chrome/browser/sync/notifier/DEPS
+++ b/chrome/browser/sync/notifier/DEPS
@@ -1,6 +1,8 @@
 include_rules = [
   # sync_notifier depends on cacheinvalidation.
   "+google/cacheinvalidation",
+  # sync_notifier depends on the common jingle notifier classes.
+  "+jingle/notifier",
   # sync_notifier depends on the xmpp part of libjingle.
   "+talk/xmpp",
 ]
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc
index dbc3d54..fea98fe 100644
--- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc
+++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc
@@ -7,8 +7,8 @@
 #include "base/base64.h"
 #include "base/callback.h"
 #include "base/logging.h"
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
 #include "google/cacheinvalidation/invalidation-client.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/xmpp/constants.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmppclient.h"
diff --git a/chrome/browser/sync/notifier/server_notifier_thread.cc b/chrome/browser/sync/notifier/server_notifier_thread.cc
index 19b2f40..ce416eb 100644
--- a/chrome/browser/sync/notifier/server_notifier_thread.cc
+++ b/chrome/browser/sync/notifier/server_notifier_thread.cc
@@ -9,7 +9,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
-#include "chrome/common/net/notifier/listener/notification_defines.h"
+#include "jingle/notifier/listener/notification_defines.h"
 
 namespace sync_notifier {
 
diff --git a/chrome/browser/sync/notifier/server_notifier_thread.h b/chrome/browser/sync/notifier/server_notifier_thread.h
index 97f5990..2f5ca1d 100644
--- a/chrome/browser/sync/notifier/server_notifier_thread.h
+++ b/chrome/browser/sync/notifier/server_notifier_thread.h
@@ -18,7 +18,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
 #include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
 
 namespace sync_notifier {
 
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc
index 7e5df7c..c8f89d5 100644
--- a/chrome/browser/sync/tools/sync_listen_notifications.cc
+++ b/chrome/browser/sync/tools/sync_listen_notifications.cc
@@ -18,11 +18,12 @@
 #include "chrome/browser/sync/notifier/chrome_system_resources.h"
 #include "chrome/browser/sync/sync_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/net/notifier/base/task_pump.h"
-#include "chrome/common/net/notifier/communicator/xmpp_socket_adapter.h"
-#include "chrome/common/net/notifier/listener/listen_task.h"
-#include "chrome/common/net/notifier/listener/notification_constants.h"
-#include "chrome/common/net/notifier/listener/subscribe_task.h"
+#include "google/cacheinvalidation/invalidation-client.h"
+#include "jingle/notifier/base/task_pump.h"
+#include "jingle/notifier/communicator/xmpp_socket_adapter.h"
+#include "jingle/notifier/listener/listen_task.h"
+#include "jingle/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/subscribe_task.h"
 #include "talk/base/cryptstring.h"
 #include "talk/base/logging.h"
 #include "talk/base/sigslot.h"
diff --git a/chrome/browser/sync/tools/sync_tools.gyp b/chrome/browser/sync/tools/sync_tools.gyp
index 124f116..6059ea8 100644
--- a/chrome/browser/sync/tools/sync_tools.gyp
+++ b/chrome/browser/sync/tools/sync_tools.gyp
@@ -21,8 +21,8 @@
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/chrome/chrome.gyp:common_constants',
-        '<(DEPTH)/chrome/chrome.gyp:notifier',
         '<(DEPTH)/chrome/chrome.gyp:sync_notifier',
+        '<(DEPTH)/jingle/jingle.gyp:notifier',
         '<(DEPTH)/third_party/libjingle/libjingle.gyp:libjingle',
       ],
     },
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 238db5c..320ab5d 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -781,13 +781,13 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../jingle/jingle.gyp:notifier',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'common_constants',
         'common_net',
-        'notifier',
         'sync',
         'sync_notifier',
       ],
@@ -799,98 +799,6 @@
         }],
       ],
     },
-    # A library for sending and receiving peer-issued notifications.
-    #
-    # TODO(akalin): Separate out the XMPP stuff from this library into
-    # its own library.
-    {
-      'target_name': 'notifier',
-      'type': '<(library)',
-      'sources': [
-        'common/net/notifier/base/signal_thread_task.h',
-        'common/net/notifier/base/ssl_adapter.h',
-        'common/net/notifier/base/ssl_adapter.cc',
-        'common/net/notifier/base/static_assert.h',
-        'common/net/notifier/base/task_pump.cc',
-        'common/net/notifier/base/task_pump.h',
-        'common/net/notifier/communicator/auto_reconnect.cc',
-        'common/net/notifier/communicator/auto_reconnect.h',
-        'common/net/notifier/communicator/connection_options.cc',
-        'common/net/notifier/communicator/connection_options.h',
-        'common/net/notifier/communicator/connection_settings.cc',
-        'common/net/notifier/communicator/connection_settings.h',
-        'common/net/notifier/communicator/const_communicator.h',
-        'common/net/notifier/communicator/gaia_token_pre_xmpp_auth.cc',
-        'common/net/notifier/communicator/gaia_token_pre_xmpp_auth.h',
-        'common/net/notifier/communicator/login.cc',
-        'common/net/notifier/communicator/login.h',
-        'common/net/notifier/communicator/login_connection_state.h',
-        'common/net/notifier/communicator/login_failure.cc',
-        'common/net/notifier/communicator/login_failure.h',
-        'common/net/notifier/communicator/login_settings.cc',
-        'common/net/notifier/communicator/login_settings.h',
-        'common/net/notifier/communicator/product_info.cc',
-        'common/net/notifier/communicator/product_info.h',
-        'common/net/notifier/communicator/single_login_attempt.cc',
-        'common/net/notifier/communicator/single_login_attempt.h',
-        'common/net/notifier/communicator/ssl_socket_adapter.cc',
-        'common/net/notifier/communicator/ssl_socket_adapter.h',
-        'common/net/notifier/communicator/xmpp_connection_generator.cc',
-        'common/net/notifier/communicator/xmpp_connection_generator.h',
-        'common/net/notifier/communicator/xmpp_socket_adapter.cc',
-        'common/net/notifier/communicator/xmpp_socket_adapter.h',
-        'common/net/notifier/listener/listen_task.cc',
-        'common/net/notifier/listener/listen_task.h',
-        'common/net/notifier/listener/mediator_thread.h',
-        'common/net/notifier/listener/mediator_thread_impl.cc',
-        'common/net/notifier/listener/mediator_thread_impl.h',
-        'common/net/notifier/listener/mediator_thread_mock.h',
-        'common/net/notifier/listener/notification_constants.cc',
-        'common/net/notifier/listener/notification_constants.h',
-        'common/net/notifier/listener/notification_defines.h',
-        'common/net/notifier/listener/send_update_task.cc',
-        'common/net/notifier/listener/send_update_task.h',
-        'common/net/notifier/base/sigslotrepeater.h',
-        'common/net/notifier/listener/subscribe_task.cc',
-        'common/net/notifier/listener/subscribe_task.h',
-        'common/net/notifier/listener/talk_mediator.h',
-        'common/net/notifier/listener/talk_mediator_impl.cc',
-        'common/net/notifier/listener/talk_mediator_impl.h',
-        'common/net/notifier/listener/xml_element_util.cc',
-        'common/net/notifier/listener/xml_element_util.h',
-      ],
-      'include_dirs': [
-        '..',
-        '<(protoc_out_dir)',
-      ],
-      'defines' : [
-        '_CRT_SECURE_NO_WARNINGS',
-        '_USE_32BIT_TIME_T',
-        'kXmppProductName="chromium-sync"',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../net/net.gyp:net',
-        '../third_party/expat/expat.gyp:expat',
-        '../third_party/libjingle/libjingle.gyp:libjingle',
-        'common_net',
-      ],
-      'export_dependent_settings': [
-        '../third_party/libjingle/libjingle.gyp:libjingle',
-      ],
-      'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk'
-          ],
-        }],
-        ['OS=="linux" and chromeos==1', {
-          'include_dirs': [
-            '<(grit_out_dir)',
-          ],
-        }],
-      ],
-    },
     {
       'target_name': 'sync',
       'type': '<(library)',
@@ -1092,15 +1000,15 @@
         '..',
       ],
       'dependencies': [
-        'notifier',
         'sync',
+        '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       # This target exports a hard dependency because it depends on
       # cacheinvalidation (which itself has hard_dependency set).
       'hard_dependency': 1,
       'export_dependent_settings': [
-        'notifier',
+        '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
     },
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e956ce6..a4daba3 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1804,41 +1804,6 @@
       ], # conditions
     },
     {
-      'target_name': 'notifier_unit_tests',
-      'type': 'executable',
-      'sources': [
-        # TODO(akalin): Write our own test suite and runner.
-        '../base/test/run_all_unittests.cc',
-        '../base/test/test_suite.h',
-        'common/net/notifier/listener/talk_mediator_unittest.cc',
-        'common/net/notifier/listener/send_update_task_unittest.cc',
-        'common/net/notifier/listener/subscribe_task_unittest.cc',
-        'common/net/notifier/listener/xml_element_util_unittest.cc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        'notifier',
-        '../base/base.gyp:base',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/libjingle/libjingle.gyp:libjingle',
-      ],
-      # TODO(akalin): Remove this once we have our own test suite and
-      # runner.
-      'conditions': [
-        ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-          'dependencies': [
-            # Needed to handle the #include chain:
-            #   base/test/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'sync_unit_tests',
       'type': 'executable',
       'sources': [
diff --git a/chrome/service/cloud_print/DEPS b/chrome/service/cloud_print/DEPS
new file mode 100644
index 0000000..52393c8
--- /dev/null
+++ b/chrome/service/cloud_print/DEPS
@@ -0,0 +1,4 @@
+include_rules = [
+  # sync notifier depends on the common jingle notifier classes.
+  "+jingle/notifier",
+]
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
index 6cc5098..9b8751f 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -12,10 +12,10 @@
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/printer_job_handler.h"
-#include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
-#include "chrome/common/net/notifier/listener/talk_mediator_impl.h"
 #include "chrome/service/gaia/service_gaia_authenticator.h"
 #include "chrome/service/service_process.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/talk_mediator_impl.h"
 
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
@@ -659,4 +659,3 @@ void CloudPrintProxyBackend::Core::OnPrinterJobHandlerShutdown(
   LOG(INFO) << "CP_PROXY: Printer job handle shutdown, id " << printer_id;
   job_handler_map_.erase(printer_id);
 }
-
diff --git a/jingle/DEPS b/jingle/DEPS
new file mode 100644
index 0000000..8fa9d48
--- /dev/null
+++ b/jingle/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+net",
+]
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
new file mode 100644
index 0000000..88eb6bb
--- /dev/null
+++ b/jingle/jingle.gyp
@@ -0,0 +1,139 @@
+# Copyright (c) 2010 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.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },  # variables
+  'targets': [
+    # A library for sending and receiving peer-issued notifications.
+    #
+    # TODO(akalin): Separate out the XMPP stuff from this library into
+    # its own library.
+    {
+      'target_name': 'notifier',
+      'type': '<(library)',
+      'sources': [
+        'notifier/base/signal_thread_task.h',
+        'notifier/base/ssl_adapter.h',
+        'notifier/base/ssl_adapter.cc',
+        'notifier/base/static_assert.h',
+        'notifier/base/task_pump.cc',
+        'notifier/base/task_pump.h',
+        'notifier/communicator/auto_reconnect.cc',
+        'notifier/communicator/auto_reconnect.h',
+        'notifier/communicator/connection_options.cc',
+        'notifier/communicator/connection_options.h',
+        'notifier/communicator/connection_settings.cc',
+        'notifier/communicator/connection_settings.h',
+        'notifier/communicator/const_communicator.h',
+        'notifier/communicator/gaia_token_pre_xmpp_auth.cc',
+        'notifier/communicator/gaia_token_pre_xmpp_auth.h',
+        'notifier/communicator/login.cc',
+        'notifier/communicator/login.h',
+        'notifier/communicator/login_connection_state.h',
+        'notifier/communicator/login_failure.cc',
+        'notifier/communicator/login_failure.h',
+        'notifier/communicator/login_settings.cc',
+        'notifier/communicator/login_settings.h',
+        'notifier/communicator/product_info.cc',
+        'notifier/communicator/product_info.h',
+        'notifier/communicator/single_login_attempt.cc',
+        'notifier/communicator/single_login_attempt.h',
+        'notifier/communicator/ssl_socket_adapter.cc',
+        'notifier/communicator/ssl_socket_adapter.h',
+        'notifier/communicator/xmpp_connection_generator.cc',
+        'notifier/communicator/xmpp_connection_generator.h',
+        'notifier/communicator/xmpp_socket_adapter.cc',
+        'notifier/communicator/xmpp_socket_adapter.h',
+        'notifier/listener/listen_task.cc',
+        'notifier/listener/listen_task.h',
+        'notifier/listener/mediator_thread.h',
+        'notifier/listener/mediator_thread_impl.cc',
+        'notifier/listener/mediator_thread_impl.h',
+        'notifier/listener/mediator_thread_mock.h',
+        'notifier/listener/notification_constants.cc',
+        'notifier/listener/notification_constants.h',
+        'notifier/listener/notification_defines.h',
+        'notifier/listener/send_update_task.cc',
+        'notifier/listener/send_update_task.h',
+        'notifier/base/sigslotrepeater.h',
+        'notifier/listener/subscribe_task.cc',
+        'notifier/listener/subscribe_task.h',
+        'notifier/listener/talk_mediator.h',
+        'notifier/listener/talk_mediator_impl.cc',
+        'notifier/listener/talk_mediator_impl.h',
+        'notifier/listener/xml_element_util.cc',
+        'notifier/listener/xml_element_util.h',
+      ],
+      'defines' : [
+        '_CRT_SECURE_NO_WARNINGS',
+        '_USE_32BIT_TIME_T',
+        'kXmppProductName="chromium-sync"',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../third_party/expat/expat.gyp:expat',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+      ],
+      'export_dependent_settings': [
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+      ],
+      'conditions': [
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk'
+          ],
+        }],
+        ['OS=="linux" and chromeos==1', {
+          'include_dirs': [
+            '<(grit_out_dir)',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'notifier_unit_tests',
+      'type': 'executable',
+      'sources': [
+        # TODO(akalin): Write our own test suite and runner.
+        '../base/test/run_all_unittests.cc',
+        '../base/test/test_suite.h',
+        'notifier/listener/talk_mediator_unittest.cc',
+        'notifier/listener/send_update_task_unittest.cc',
+        'notifier/listener/subscribe_task_unittest.cc',
+        'notifier/listener/xml_element_util_unittest.cc',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        'notifier',
+        '../base/base.gyp:base',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+      ],
+      # TODO(akalin): Remove this once we have our own test suite and
+      # runner.
+      'conditions': [
+        ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+          'dependencies': [
+            # Needed to handle the #include chain:
+            #   base/test/test_suite.h
+            #   gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/chrome/common/net/notifier/DEPS b/jingle/notifier/DEPS
index 2d7d13f..2d7d13f 100644
--- a/chrome/common/net/notifier/DEPS
+++ b/jingle/notifier/DEPS
diff --git a/chrome/common/net/notifier/base/signal_thread_task.h b/jingle/notifier/base/signal_thread_task.h
index 4e9b2c9..8a6ff27 100644
--- a/chrome/common/net/notifier/base/signal_thread_task.h
+++ b/jingle/notifier/base/signal_thread_task.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_
-#define CHROME_COMMON_NET_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_
+#ifndef JINGLE_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_
+#define JINGLE_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_
 
 #include "base/logging.h"
 #include "talk/base/common.h"
@@ -93,4 +93,4 @@ class SignalThreadTask : public talk_base::Task,
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_
+#endif  // JINGLE_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_
diff --git a/chrome/common/net/notifier/base/sigslotrepeater.h b/jingle/notifier/base/sigslotrepeater.h
index 45dfba1..cafb491 100644
--- a/chrome/common/net/notifier/base/sigslotrepeater.h
+++ b/jingle/notifier/base/sigslotrepeater.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_SIGSLOTREPEATER_H_
-#define CHROME_COMMON_NET_NOTIFIER_BASE_SIGSLOTREPEATER_H_
+#ifndef JINGLE_NOTIFIER_BASE_SIGSLOTREPEATER_H_
+#define JINGLE_NOTIFIER_BASE_SIGSLOTREPEATER_H_
 
 // Repeaters are both signals and slots, which are designed as intermediate
 // pass-throughs for signals and slots which don't know about each other (for
@@ -80,4 +80,4 @@ class repeater3 : public signal3<arg1_type, arg2_type, arg3_type, mt_policy>,
 
 }  // namespace sigslot
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_BASE_SIGSLOTREPEATER_H_
+#endif  // JINGLE_NOTIFIER_BASE_SIGSLOTREPEATER_H_
diff --git a/chrome/common/net/notifier/base/ssl_adapter.cc b/jingle/notifier/base/ssl_adapter.cc
index 9f12019..2111244 100644
--- a/chrome/common/net/notifier/base/ssl_adapter.cc
+++ b/jingle/notifier/base/ssl_adapter.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/base/ssl_adapter.h"
+#include "jingle/notifier/base/ssl_adapter.h"
 
 #if defined(OS_WIN)
 #include "talk/base/ssladapter.h"
 #else
-#include "chrome/common/net/notifier/communicator/ssl_socket_adapter.h"
+#include "jingle/notifier/communicator/ssl_socket_adapter.h"
 #endif
 
 namespace notifier {
diff --git a/chrome/common/net/notifier/base/ssl_adapter.h b/jingle/notifier/base/ssl_adapter.h
index bd39d3b..32517cd 100644
--- a/chrome/common/net/notifier/base/ssl_adapter.h
+++ b/jingle/notifier/base/ssl_adapter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_SSL_ADAPTER_H_
-#define CHROME_COMMON_NET_NOTIFIER_BASE_SSL_ADAPTER_H_
+#ifndef JINGLE_NOTIFIER_BASE_SSL_ADAPTER_H_
+#define JINGLE_NOTIFIER_BASE_SSL_ADAPTER_H_
 
 namespace talk_base {
 class AsyncSocket;
@@ -29,5 +29,5 @@ class SSLAdapterSocketFactory : public SocketFactory {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_BASE_SSL_ADAPTER_H_
+#endif  // JINGLE_NOTIFIER_BASE_SSL_ADAPTER_H_
 
diff --git a/chrome/common/net/notifier/base/static_assert.h b/jingle/notifier/base/static_assert.h
index 5ebf335f..58a8fe4 100644
--- a/chrome/common/net/notifier/base/static_assert.h
+++ b/jingle/notifier/base/static_assert.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_STATIC_ASSERT_H_
-#define CHROME_COMMON_NET_NOTIFIER_BASE_STATIC_ASSERT_H_
+#ifndef JINGLE_NOTIFIER_BASE_STATIC_ASSERT_H_
+#define JINGLE_NOTIFIER_BASE_STATIC_ASSERT_H_
 
 template<bool> struct STATIC_ASSERTION_FAILURE;
 
@@ -18,4 +18,4 @@ typedef static_assert_test<\
   sizeof(STATIC_ASSERTION_FAILURE< (bool)( B ) >)>\
     static_assert_typedef_ ##  __LINE__
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_BASE_STATIC_ASSERT_H_
+#endif  // JINGLE_NOTIFIER_BASE_STATIC_ASSERT_H_
diff --git a/chrome/common/net/notifier/base/task_pump.cc b/jingle/notifier/base/task_pump.cc
index 17bde88..52ffd26 100644
--- a/chrome/common/net/notifier/base/task_pump.cc
+++ b/jingle/notifier/base/task_pump.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "chrome/common/net/notifier/base/task_pump.h"
+#include "jingle/notifier/base/task_pump.h"
 
 namespace notifier {
 
diff --git a/chrome/common/net/notifier/base/task_pump.h b/jingle/notifier/base/task_pump.h
index 6aab9dd..806fed2 100644
--- a/chrome/common/net/notifier/base/task_pump.h
+++ b/jingle/notifier/base/task_pump.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_TASK_PUMP_H_
-#define CHROME_COMMON_NET_NOTIFIER_BASE_TASK_PUMP_H_
+#ifndef JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
+#define JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
 
 #include "base/task.h"
 #include "talk/base/taskrunner.h"
@@ -31,4 +31,4 @@ class TaskPump : public talk_base::TaskRunner {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_BASE_TASK_PUMP_H_
+#endif  // JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
diff --git a/chrome/common/net/notifier/communicator/auto_reconnect.cc b/jingle/notifier/communicator/auto_reconnect.cc
index 49edf89..4b16e93 100644
--- a/chrome/common/net/notifier/communicator/auto_reconnect.cc
+++ b/jingle/notifier/communicator/auto_reconnect.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/communicator/auto_reconnect.h"
+#include "jingle/notifier/communicator/auto_reconnect.h"
 
 #include "base/rand_util.h"
-#include "chrome/common/net/notifier/communicator/login.h"
+#include "jingle/notifier/communicator/login.h"
 
 namespace notifier {
 
diff --git a/chrome/common/net/notifier/communicator/auto_reconnect.h b/jingle/notifier/communicator/auto_reconnect.h
index 3b914c1..6b2fa09 100644
--- a/chrome/common/net/notifier/communicator/auto_reconnect.h
+++ b/jingle/notifier/communicator/auto_reconnect.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_
 
 #include <string>
 
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/common/net/notifier/communicator/login_connection_state.h"
+#include "jingle/notifier/communicator/login_connection_state.h"
 #include "talk/base/sigslot.h"
 
 namespace notifier {
@@ -64,4 +64,4 @@ extern const int kResetReconnectInfoDelaySec;
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_
diff --git a/chrome/common/net/notifier/communicator/connection_options.cc b/jingle/notifier/communicator/connection_options.cc
index 1e5b6e7..fe52d7f 100644
--- a/chrome/common/net/notifier/communicator/connection_options.cc
+++ b/jingle/notifier/communicator/connection_options.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/communicator/connection_options.h"
+#include "jingle/notifier/communicator/connection_options.h"
 
 namespace notifier {
 
diff --git a/chrome/common/net/notifier/communicator/connection_options.h b/jingle/notifier/communicator/connection_options.h
index b42023b..de09910 100644
--- a/chrome/common/net/notifier/communicator/connection_options.h
+++ b/jingle/notifier/communicator/connection_options.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_
 
 #include <string>
 
@@ -53,4 +53,4 @@ class ConnectionOptions {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_
diff --git a/chrome/common/net/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc
index 39005a2..1347e46 100644
--- a/chrome/common/net/notifier/communicator/connection_settings.cc
+++ b/jingle/notifier/communicator/connection_settings.cc
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "chrome/common/net/notifier/communicator/connection_settings.h"
+#include "jingle/notifier/communicator/connection_settings.h"
 #include "talk/base/helpers.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
diff --git a/chrome/common/net/notifier/communicator/connection_settings.h b/jingle/notifier/communicator/connection_settings.h
index fc5ef4c..54051a6 100644
--- a/chrome/common/net/notifier/communicator/connection_settings.h
+++ b/jingle/notifier/communicator/connection_settings.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_
 
 #include <deque>
 #include <string>
@@ -73,4 +73,4 @@ class ConnectionSettingsList {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_
diff --git a/chrome/common/net/notifier/communicator/const_communicator.h b/jingle/notifier/communicator/const_communicator.h
index 0b0a18a..5f49a62 100644
--- a/chrome/common/net/notifier/communicator/const_communicator.h
+++ b/jingle/notifier/communicator/const_communicator.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_
 
 namespace notifier {
 // The default port for jabber/xmpp communications.
 const int kDefaultXmppPort = 5222;
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_
diff --git a/chrome/common/net/notifier/communicator/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/communicator/gaia_token_pre_xmpp_auth.cc
index 57003e8..bcc6f04 100644
--- a/chrome/common/net/notifier/communicator/gaia_token_pre_xmpp_auth.cc
+++ b/jingle/notifier/communicator/gaia_token_pre_xmpp_auth.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/communicator/gaia_token_pre_xmpp_auth.h"
+#include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h"
 
 #include <algorithm>
 
diff --git a/chrome/common/net/notifier/communicator/gaia_token_pre_xmpp_auth.h b/jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h
index 0eb6aa0..a18c77a 100644
--- a/chrome/common/net/notifier/communicator/gaia_token_pre_xmpp_auth.h
+++ b/jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_GAIA_TOKEN_PRE_XMPP_AUTH_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_GAIA_TOKEN_PRE_XMPP_AUTH_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_GAIA_TOKEN_PRE_XMPP_AUTH_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_GAIA_TOKEN_PRE_XMPP_AUTH_H_
 
 #include <string>
 #include <vector>
@@ -58,4 +58,4 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_GAIA_TOKEN_PRE_XMPP_AUTH_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_GAIA_TOKEN_PRE_XMPP_AUTH_H_
diff --git a/chrome/common/net/notifier/communicator/login.cc b/jingle/notifier/communicator/login.cc
index f1ed19a..74af528 100644
--- a/chrome/common/net/notifier/communicator/login.cc
+++ b/jingle/notifier/communicator/login.cc
@@ -4,15 +4,15 @@
 
 #include <string>
 
-#include "chrome/common/net/notifier/communicator/login.h"
+#include "jingle/notifier/communicator/login.h"
 
 #include "base/logging.h"
 #include "base/time.h"
-#include "chrome/common/net/notifier/communicator/auto_reconnect.h"
-#include "chrome/common/net/notifier/communicator/connection_options.h"
-#include "chrome/common/net/notifier/communicator/login_settings.h"
-#include "chrome/common/net/notifier/communicator/product_info.h"
-#include "chrome/common/net/notifier/communicator/single_login_attempt.h"
+#include "jingle/notifier/communicator/auto_reconnect.h"
+#include "jingle/notifier/communicator/connection_options.h"
+#include "jingle/notifier/communicator/login_settings.h"
+#include "jingle/notifier/communicator/product_info.h"
+#include "jingle/notifier/communicator/single_login_attempt.h"
 #include "net/base/host_port_pair.h"
 #include "talk/base/common.h"
 #include "talk/base/firewallsocketserver.h"
diff --git a/chrome/common/net/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index eff1cc5..bd41cb5 100644
--- a/chrome/common/net/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_H_
 
 #include <string>
 
 #include "base/time.h"
 #include "base/timer.h"
-#include "chrome/common/net/notifier/base/sigslotrepeater.h"
-#include "chrome/common/net/notifier/communicator/auto_reconnect.h"
-#include "chrome/common/net/notifier/communicator/login_connection_state.h"
+#include "jingle/notifier/base/sigslotrepeater.h"
+#include "jingle/notifier/communicator/auto_reconnect.h"
+#include "jingle/notifier/communicator/login_connection_state.h"
 #include "net/base/network_change_notifier.h"
 #include "talk/base/proxyinfo.h"
 #include "talk/base/scoped_ptr.h"
@@ -148,4 +148,4 @@ class Login : public net::NetworkChangeNotifier::Observer,
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_H_
diff --git a/chrome/common/net/notifier/communicator/login_connection_state.h b/jingle/notifier/communicator/login_connection_state.h
index cc57d62..db90451 100644
--- a/chrome/common/net/notifier/communicator/login_connection_state.h
+++ b/jingle/notifier/communicator/login_connection_state.h
@@ -5,8 +5,8 @@
 // LoginConnectionState is an enum representing the state of the XMPP
 // connection.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_CONNECTION_STATE_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_CONNECTION_STATE_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_CONNECTION_STATE_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_CONNECTION_STATE_H_
 
 namespace notifier {
 
@@ -21,4 +21,4 @@ enum LoginConnectionState {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_CONNECTION_STATE_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_CONNECTION_STATE_H_
diff --git a/chrome/common/net/notifier/communicator/login_failure.cc b/jingle/notifier/communicator/login_failure.cc
index aed32bf..85b0fcf 100644
--- a/chrome/common/net/notifier/communicator/login_failure.cc
+++ b/jingle/notifier/communicator/login_failure.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/communicator/login_failure.h"
+#include "jingle/notifier/communicator/login_failure.h"
 
 #include "base/logging.h"
 
diff --git a/chrome/common/net/notifier/communicator/login_failure.h b/jingle/notifier/communicator/login_failure.h
index 05505ce..af4b66c 100644
--- a/chrome/common/net/notifier/communicator/login_failure.h
+++ b/jingle/notifier/communicator/login_failure.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_
 
 #include "talk/xmpp/xmppengine.h"
 
@@ -47,4 +47,4 @@ class LoginFailure {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_
diff --git a/chrome/common/net/notifier/communicator/login_settings.cc b/jingle/notifier/communicator/login_settings.cc
index 23ea983..43298eb 100644
--- a/chrome/common/net/notifier/communicator/login_settings.cc
+++ b/jingle/notifier/communicator/login_settings.cc
@@ -4,11 +4,11 @@
 
 #include <string>
 
-#include "chrome/common/net/notifier/communicator/login_settings.h"
+#include "jingle/notifier/communicator/login_settings.h"
 
 #include "base/logging.h"
-#include "chrome/common/net/notifier/communicator/connection_options.h"
-#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h"
+#include "jingle/notifier/communicator/connection_options.h"
+#include "jingle/notifier/communicator/xmpp_connection_generator.h"
 #include "talk/base/common.h"
 #include "talk/base/socketaddress.h"
 #include "talk/xmpp/xmppclientsettings.h"
diff --git a/chrome/common/net/notifier/communicator/login_settings.h b/jingle/notifier/communicator/login_settings.h
index 90eae31..32ea038 100644
--- a/chrome/common/net/notifier/communicator/login_settings.h
+++ b/jingle/notifier/communicator/login_settings.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
 #include <string>
 
-#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h"
+#include "jingle/notifier/communicator/xmpp_connection_generator.h"
 #include "talk/base/scoped_ptr.h"
 
 namespace buzz {
@@ -99,4 +99,4 @@ class LoginSettings {
   DISALLOW_COPY_AND_ASSIGN(LoginSettings);
 };
 }  // namespace notifier
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
diff --git a/chrome/common/net/notifier/communicator/product_info.cc b/jingle/notifier/communicator/product_info.cc
index c1deafb..c1deafb 100644
--- a/chrome/common/net/notifier/communicator/product_info.cc
+++ b/jingle/notifier/communicator/product_info.cc
diff --git a/chrome/common/net/notifier/communicator/product_info.h b/jingle/notifier/communicator/product_info.h
index 6144122..9e8e5d0 100644
--- a/chrome/common/net/notifier/communicator/product_info.h
+++ b/jingle/notifier/communicator/product_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_
 
 #include <string>
 
@@ -12,4 +12,4 @@ std::string GetUserAgentString();
 std::string GetProductSignature();
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_
diff --git a/chrome/common/net/notifier/communicator/single_login_attempt.cc b/jingle/notifier/communicator/single_login_attempt.cc
index 7781c38..00163c09 100644
--- a/chrome/common/net/notifier/communicator/single_login_attempt.cc
+++ b/jingle/notifier/communicator/single_login_attempt.cc
@@ -6,18 +6,18 @@
 #include <string>
 #include <vector>
 
-#include "chrome/common/net/notifier/communicator/single_login_attempt.h"
+#include "jingle/notifier/communicator/single_login_attempt.h"
 
 #include "base/logging.h"
-#include "chrome/common/net/notifier/communicator/connection_options.h"
-#include "chrome/common/net/notifier/communicator/connection_settings.h"
-#include "chrome/common/net/notifier/communicator/const_communicator.h"
-#include "chrome/common/net/notifier/communicator/gaia_token_pre_xmpp_auth.h"
-#include "chrome/common/net/notifier/communicator/login_failure.h"
-#include "chrome/common/net/notifier/communicator/login_settings.h"
-#include "chrome/common/net/notifier/communicator/product_info.h"
-#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h"
-#include "chrome/common/net/notifier/communicator/xmpp_socket_adapter.h"
+#include "jingle/notifier/communicator/connection_options.h"
+#include "jingle/notifier/communicator/connection_settings.h"
+#include "jingle/notifier/communicator/const_communicator.h"
+#include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h"
+#include "jingle/notifier/communicator/login_failure.h"
+#include "jingle/notifier/communicator/login_settings.h"
+#include "jingle/notifier/communicator/product_info.h"
+#include "jingle/notifier/communicator/xmpp_connection_generator.h"
+#include "jingle/notifier/communicator/xmpp_socket_adapter.h"
 #include "talk/base/asynchttprequest.h"
 #include "talk/base/firewallsocketserver.h"
 #include "talk/base/signalthread.h"
diff --git a/chrome/common/net/notifier/communicator/single_login_attempt.h b/jingle/notifier/communicator/single_login_attempt.h
index 245fa9d..3595c0fb 100644
--- a/chrome/common/net/notifier/communicator/single_login_attempt.h
+++ b/jingle/notifier/communicator/single_login_attempt.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_
 
 #include <string>
 
-#include "chrome/common/net/notifier/communicator/login.h"
+#include "jingle/notifier/communicator/login.h"
 #include "talk/base/scoped_ptr.h"
 #include "talk/base/sigslot.h"
 #include "talk/base/task.h"
@@ -135,4 +135,4 @@ class SingleLoginAttempt : public talk_base::Task, public sigslot::has_slots<> {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_
diff --git a/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc b/jingle/notifier/communicator/ssl_socket_adapter.cc
index 9742283..a753710 100644
--- a/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc
+++ b/jingle/notifier/communicator/ssl_socket_adapter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/communicator/ssl_socket_adapter.h"
+#include "jingle/notifier/communicator/ssl_socket_adapter.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
diff --git a/chrome/common/net/notifier/communicator/ssl_socket_adapter.h b/jingle/notifier/communicator/ssl_socket_adapter.h
index bbb0961..a97cfaa 100644
--- a/chrome/common/net/notifier/communicator/ssl_socket_adapter.h
+++ b/jingle/notifier/communicator/ssl_socket_adapter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_
 
 #include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
@@ -131,4 +131,4 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_
diff --git a/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc b/jingle/notifier/communicator/xmpp_connection_generator.cc
index b9b1272..abadd35 100644
--- a/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc
+++ b/jingle/notifier/communicator/xmpp_connection_generator.cc
@@ -10,7 +10,7 @@
 //     for connection in connection_list
 //       yield connection
 
-#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h"
+#include "jingle/notifier/communicator/xmpp_connection_generator.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>
@@ -23,10 +23,10 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "chrome/common/net/notifier/base/signal_thread_task.h"
-#include "chrome/common/net/notifier/communicator/connection_options.h"
-#include "chrome/common/net/notifier/communicator/connection_settings.h"
-#include "chrome/common/net/notifier/communicator/product_info.h"
+#include "jingle/notifier/base/signal_thread_task.h"
+#include "jingle/notifier/communicator/connection_options.h"
+#include "jingle/notifier/communicator/connection_settings.h"
+#include "jingle/notifier/communicator/product_info.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
 #include "talk/base/httpcommon-inl.h"
diff --git a/chrome/common/net/notifier/communicator/xmpp_connection_generator.h b/jingle/notifier/communicator/xmpp_connection_generator.h
index 1f9dfaa..43b5329 100644
--- a/chrome/common/net/notifier/communicator/xmpp_connection_generator.h
+++ b/jingle/notifier/communicator/xmpp_connection_generator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_
 
 #include <vector>
 
@@ -91,4 +91,4 @@ class XmppConnectionGenerator : public sigslot::has_slots<> {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_
diff --git a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc b/jingle/notifier/communicator/xmpp_socket_adapter.cc
index 7fe2b17..7d7a2e9 100644
--- a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
+++ b/jingle/notifier/communicator/xmpp_socket_adapter.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/communicator/xmpp_socket_adapter.h"
+#include "jingle/notifier/communicator/xmpp_socket_adapter.h"
 
 #include <iomanip>
 #include <string>
 
 #include "base/logging.h"
-#include "chrome/common/net/notifier/base/ssl_adapter.h"
-#include "chrome/common/net/notifier/communicator/product_info.h"
+#include "jingle/notifier/base/ssl_adapter.h"
+#include "jingle/notifier/communicator/product_info.h"
 #include "talk/base/byteorder.h"
 #include "talk/base/common.h"
 #include "talk/base/firewallsocketserver.h"
diff --git a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.h b/jingle/notifier/communicator/xmpp_socket_adapter.h
index e818173..ff22a9c 100644
--- a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.h
+++ b/jingle/notifier/communicator/xmpp_socket_adapter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_
-#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_
+#ifndef JINGLE_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_
+#define JINGLE_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_
 
 #include <string>
 
@@ -84,4 +84,4 @@ class XmppSocketAdapter : public buzz::AsyncSocket,
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_
+#endif  // JINGLE_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_
diff --git a/chrome/common/net/notifier/listener/listen_task.cc b/jingle/notifier/listener/listen_task.cc
index 715eeb9..bfa79c1 100644
--- a/chrome/common/net/notifier/listener/listen_task.cc
+++ b/jingle/notifier/listener/listen_task.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/listen_task.h"
+#include "jingle/notifier/listener/listen_task.h"
 
 #include "base/logging.h"
-#include "chrome/common/net/notifier/listener/notification_constants.h"
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/base/task.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
diff --git a/chrome/common/net/notifier/listener/listen_task.h b/jingle/notifier/listener/listen_task.h
index c4f2a6fa..6a86775 100644
--- a/chrome/common/net/notifier/listener/listen_task.h
+++ b/jingle/notifier/listener/listen_task.h
@@ -9,10 +9,10 @@
 // The task is deleted automatically by the buzz::XmppClient. This occurs in the
 // destructor of TaskRunner, which is a superclass of buzz::XmppClient.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_LISTEN_TASK_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_LISTEN_TASK_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_LISTEN_TASK_H_
+#define JINGLE_NOTIFIER_LISTENER_LISTEN_TASK_H_
 
-#include "chrome/common/net/notifier/listener/notification_defines.h"
+#include "jingle/notifier/listener/notification_defines.h"
 #include "talk/xmpp/xmpptask.h"
 
 namespace buzz {
@@ -46,4 +46,4 @@ class ListenTask : public buzz::XmppTask {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_LISTEN_TASK_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_LISTEN_TASK_H_
diff --git a/chrome/common/net/notifier/listener/mediator_thread.h b/jingle/notifier/listener/mediator_thread.h
index f90a199..643b1e5 100644
--- a/chrome/common/net/notifier/listener/mediator_thread.h
+++ b/jingle/notifier/listener/mediator_thread.h
@@ -5,13 +5,13 @@
 // These methods should post messages to a queue which a different thread will
 // later come back and read from.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_
+#define JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_
 
 #include <string>
 #include <vector>
 
-#include "chrome/common/net/notifier/listener/notification_defines.h"
+#include "jingle/notifier/listener/notification_defines.h"
 
 namespace buzz {
 class XmppClientSettings;
@@ -52,4 +52,4 @@ class MediatorThread {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_
diff --git a/chrome/common/net/notifier/listener/mediator_thread_impl.cc b/jingle/notifier/listener/mediator_thread_impl.cc
index 13de806..9f740dd 100644
--- a/chrome/common/net/notifier/listener/mediator_thread_impl.cc
+++ b/jingle/notifier/listener/mediator_thread_impl.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "chrome/common/net/notifier/base/task_pump.h"
-#include "chrome/common/net/notifier/communicator/connection_options.h"
-#include "chrome/common/net/notifier/communicator/const_communicator.h"
-#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h"
-#include "chrome/common/net/notifier/listener/listen_task.h"
-#include "chrome/common/net/notifier/listener/send_update_task.h"
-#include "chrome/common/net/notifier/listener/subscribe_task.h"
+#include "jingle/notifier/base/task_pump.h"
+#include "jingle/notifier/communicator/connection_options.h"
+#include "jingle/notifier/communicator/const_communicator.h"
+#include "jingle/notifier/communicator/xmpp_connection_generator.h"
+#include "jingle/notifier/listener/listen_task.h"
+#include "jingle/notifier/listener/send_update_task.h"
+#include "jingle/notifier/listener/subscribe_task.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "talk/base/physicalsocketserver.h"
diff --git a/chrome/common/net/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h
index df83ebd..0e2e22f 100644
--- a/chrome/common/net/notifier/listener/mediator_thread_impl.h
+++ b/jingle/notifier/listener/mediator_thread_impl.h
@@ -17,8 +17,8 @@
 //   m.Logout();
 //   delete m; // Also stops the thread.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
+#define JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -27,10 +27,10 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
-#include "chrome/common/net/notifier/communicator/login.h"
-#include "chrome/common/net/notifier/communicator/login_connection_state.h"
-#include "chrome/common/net/notifier/communicator/login_failure.h"
-#include "chrome/common/net/notifier/listener/mediator_thread.h"
+#include "jingle/notifier/communicator/login.h"
+#include "jingle/notifier/communicator/login_connection_state.h"
+#include "jingle/notifier/communicator/login_failure.h"
+#include "jingle/notifier/listener/mediator_thread.h"
 #include "talk/base/sigslot.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
@@ -139,4 +139,4 @@ class MediatorThreadImpl
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
diff --git a/chrome/common/net/notifier/listener/mediator_thread_mock.h b/jingle/notifier/listener/mediator_thread_mock.h
index 62d739e..8a1eaec 100644
--- a/chrome/common/net/notifier/listener/mediator_thread_mock.h
+++ b/jingle/notifier/listener/mediator_thread_mock.h
@@ -6,13 +6,13 @@
 // It's very primitive, and it would have been better to use gmock, except
 // that gmock is only for linux.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_
+#define JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_
 
 #include <string>
 #include <vector>
 
-#include "chrome/common/net/notifier/listener/mediator_thread.h"
+#include "jingle/notifier/listener/mediator_thread.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
@@ -94,4 +94,4 @@ class MockMediatorThread : public MediatorThread {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_
diff --git a/chrome/common/net/notifier/listener/notification_constants.cc b/jingle/notifier/listener/notification_constants.cc
index cbfbe3f..11e9157 100644
--- a/chrome/common/net/notifier/listener/notification_constants.cc
+++ b/jingle/notifier/listener/notification_constants.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/notification_constants.h"
 
 namespace notifier {
 
diff --git a/chrome/common/net/notifier/listener/notification_constants.h b/jingle/notifier/listener/notification_constants.h
index 566dc90..04d9921 100644
--- a/chrome/common/net/notifier/listener/notification_constants.h
+++ b/jingle/notifier/listener/notification_constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_
+#define JINGLE_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_
 
 namespace notifier {
 
@@ -11,4 +11,4 @@ extern const char kNotifierNamespace[];
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_
diff --git a/chrome/common/net/notifier/listener/notification_defines.h b/jingle/notifier/listener/notification_defines.h
index a2c0b42..8a42307 100644
--- a/chrome/common/net/notifier/listener/notification_defines.h
+++ b/jingle/notifier/listener/notification_defines.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_
+#define JINGLE_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_
 
 #include <string>
 
@@ -30,5 +30,5 @@ struct OutgoingNotificationData {
   bool write_to_cache_only;
 };
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_
 
diff --git a/chrome/common/net/notifier/listener/send_update_task.cc b/jingle/notifier/listener/send_update_task.cc
index eeeb0d1..e4b2884 100644
--- a/chrome/common/net/notifier/listener/send_update_task.cc
+++ b/jingle/notifier/listener/send_update_task.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/send_update_task.h"
+#include "jingle/notifier/listener/send_update_task.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/net/notifier/listener/notification_constants.h"
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmpp/xmppclient.h"
 #include "talk/xmpp/constants.h"
diff --git a/chrome/common/net/notifier/listener/send_update_task.h b/jingle/notifier/listener/send_update_task.h
index 2d78dfd..03285dd 100644
--- a/chrome/common/net/notifier/listener/send_update_task.h
+++ b/jingle/notifier/listener/send_update_task.h
@@ -4,12 +4,12 @@
 //
 // Methods for sending the update stanza to notify peers via xmpp.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_
+#define JINGLE_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_
 
 #include <string>
 
-#include "chrome/common/net/notifier/listener/notification_defines.h"
+#include "jingle/notifier/listener/notification_defines.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/xmpptask.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
@@ -44,4 +44,4 @@ class SendUpdateTask : public buzz::XmppTask {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_
diff --git a/chrome/common/net/notifier/listener/send_update_task_unittest.cc b/jingle/notifier/listener/send_update_task_unittest.cc
index 85c1ba8..80a87aa 100644
--- a/chrome/common/net/notifier/listener/send_update_task_unittest.cc
+++ b/jingle/notifier/listener/send_update_task_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/send_update_task.h"
+#include "jingle/notifier/listener/send_update_task.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/xmpp/jid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/common/net/notifier/listener/subscribe_task.cc b/jingle/notifier/listener/subscribe_task.cc
index ce12e54..7636b48 100644
--- a/chrome/common/net/notifier/listener/subscribe_task.cc
+++ b/jingle/notifier/listener/subscribe_task.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/subscribe_task.h"
+#include "jingle/notifier/listener/subscribe_task.h"
 
 #include <string>
 
 #include "base/logging.h"
-#include "chrome/common/net/notifier/listener/notification_constants.h"
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/notification_constants.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/base/task.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
diff --git a/chrome/common/net/notifier/listener/subscribe_task.h b/jingle/notifier/listener/subscribe_task.h
index 6d236ef..5b344d9 100644
--- a/chrome/common/net/notifier/listener/subscribe_task.h
+++ b/jingle/notifier/listener/subscribe_task.h
@@ -6,8 +6,8 @@
 // stanza which establishes the endpoint and directs future notifications to be
 // pushed.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_
+#define JINGLE_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_
 
 #include <string>
 #include <vector>
@@ -48,4 +48,4 @@ class SubscribeTask : public buzz::XmppTask {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_
diff --git a/chrome/common/net/notifier/listener/subscribe_task_unittest.cc b/jingle/notifier/listener/subscribe_task_unittest.cc
index fb455b2..3b44fd8 100644
--- a/chrome/common/net/notifier/listener/subscribe_task_unittest.cc
+++ b/jingle/notifier/listener/subscribe_task_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/subscribe_task.h"
+#include "jingle/notifier/listener/subscribe_task.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/xmpp/jid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/common/net/notifier/listener/talk_mediator.h b/jingle/notifier/listener/talk_mediator.h
index c842b1b..dfdc260 100644
--- a/chrome/common/net/notifier/listener/talk_mediator.h
+++ b/jingle/notifier/listener/talk_mediator.h
@@ -13,12 +13,12 @@
 //   ...
 //   mediator.Logout();
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_H_
+#define JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_H_
 
 #include <string>
 
-#include "chrome/common/net/notifier/listener/notification_defines.h"
+#include "jingle/notifier/listener/notification_defines.h"
 
 namespace notifier {
 
@@ -60,4 +60,4 @@ class TalkMediator {
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_H_
diff --git a/chrome/common/net/notifier/listener/talk_mediator_impl.cc b/jingle/notifier/listener/talk_mediator_impl.cc
index 6d5acf5..3276778 100644
--- a/chrome/common/net/notifier/listener/talk_mediator_impl.cc
+++ b/jingle/notifier/listener/talk_mediator_impl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/talk_mediator_impl.h"
+#include "jingle/notifier/listener/talk_mediator_impl.h"
 
 #include "base/logging.h"
 #include "base/singleton.h"
-#include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
 #include "talk/base/cryptstring.h"
 #include "talk/base/ssladapter.h"
 #include "talk/xmpp/xmppclientsettings.h"
diff --git a/chrome/common/net/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index e14840f..e6fc988 100644
--- a/chrome/common/net/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -6,16 +6,16 @@
 // It will manage all aspects of the connection and call back into the client
 // when it needs attention (for instance if updates are available for syncing).
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_
+#define JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/non_thread_safe.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/net/notifier/listener/mediator_thread.h"
-#include "chrome/common/net/notifier/listener/talk_mediator.h"
+#include "jingle/notifier/listener/mediator_thread.h"
+#include "jingle/notifier/listener/talk_mediator.h"
 #include "talk/base/sigslot.h"
 #include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"  // For FRIEND_TEST
@@ -101,4 +101,4 @@ class TalkMediatorImpl
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_
diff --git a/chrome/common/net/notifier/listener/talk_mediator_unittest.cc b/jingle/notifier/listener/talk_mediator_unittest.cc
index b90c577..88af342 100644
--- a/chrome/common/net/notifier/listener/talk_mediator_unittest.cc
+++ b/jingle/notifier/listener/talk_mediator_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/common/net/notifier/listener/mediator_thread_mock.h"
-#include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
-#include "chrome/common/net/notifier/listener/talk_mediator_impl.h"
+#include "jingle/notifier/listener/mediator_thread_mock.h"
+#include "jingle/notifier/listener/mediator_thread_impl.h"
+#include "jingle/notifier/listener/talk_mediator_impl.h"
 #include "talk/xmpp/xmppengine.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/common/net/notifier/listener/xml_element_util.cc b/jingle/notifier/listener/xml_element_util.cc
index 2e08b2f..9db99c9 100644
--- a/chrome/common/net/notifier/listener/xml_element_util.cc
+++ b/jingle/notifier/listener/xml_element_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 
 #include <sstream>
 #include <string>
diff --git a/chrome/common/net/notifier/listener/xml_element_util.h b/jingle/notifier/listener/xml_element_util.h
index a63077a..bde8657 100644
--- a/chrome/common/net/notifier/listener/xml_element_util.h
+++ b/jingle/notifier/listener/xml_element_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_
-#define CHROME_COMMON_NET_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_
+#ifndef JINGLE_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_
+#define JINGLE_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_
 
 #include <string>
 
@@ -26,4 +26,4 @@ buzz::XmlElement* MakeStringXmlElement(const char* name, const char* value);
 
 }  // namespace notifier
 
-#endif  // CHROME_COMMON_NET_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_
+#endif  // JINGLE_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_
diff --git a/chrome/common/net/notifier/listener/xml_element_util_unittest.cc b/jingle/notifier/listener/xml_element_util_unittest.cc
index 6b5ffc3..4566fe8 100644
--- a/chrome/common/net/notifier/listener/xml_element_util_unittest.cc
+++ b/jingle/notifier/listener/xml_element_util_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/net/notifier/listener/xml_element_util.h"
+#include "jingle/notifier/listener/xml_element_util.h"
 
 #include <sstream>
 #include <string>