Move chrome/common/net/notifier to jingle/notifier so that it can be …

…used by remoting/remoting.gyp. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/2885005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51216 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Jun 30, 2010 · de41766 · de41766
1 parent 5a73f90
commit de41766
Show file tree

Hide file tree

Showing 73 changed files with 365 additions and 338 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1803,41 +1803,6 @@
         }], # OS="win"
       ], # 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',