diff options
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/all_status.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/auth_watcher.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/auth_watcher_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/tools/sync_listen_notifications.cc | 10 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 142 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 62 | ||||
| -rw-r--r-- | chrome/common/net/notifier/DEPS (renamed from chrome/browser/sync/notifier/DEPS) | 0 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/async_dns_lookup.cc (renamed from chrome/browser/sync/notifier/base/async_dns_lookup.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/async_dns_lookup.h (renamed from chrome/browser/sync/notifier/base/async_dns_lookup.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/async_network_alive.h (renamed from chrome/browser/sync/notifier/base/async_network_alive.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/fastalloc.h (renamed from chrome/browser/sync/notifier/base/fastalloc.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/linux/async_network_alive_linux.cc (renamed from chrome/browser/sync/notifier/base/linux/async_network_alive_linux.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/mac/network_status_detector_task_mac.cc (renamed from chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/mac/network_status_detector_task_mac.h (renamed from chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/mac/network_status_detector_task_mac_unittest.cc (renamed from chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac_unittest.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/nethelpers.cc (renamed from chrome/browser/sync/notifier/base/nethelpers.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/nethelpers.h (renamed from chrome/browser/sync/notifier/base/nethelpers.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/network_status_detector_task.cc (renamed from chrome/browser/sync/notifier/base/network_status_detector_task.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/network_status_detector_task.h (renamed from chrome/browser/sync/notifier/base/network_status_detector_task.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/network_status_detector_task_mt.cc (renamed from chrome/browser/sync/notifier/base/network_status_detector_task_mt.cc) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/network_status_detector_task_mt.h (renamed from chrome/browser/sync/notifier/base/network_status_detector_task_mt.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/posix/time_posix.cc (renamed from chrome/browser/sync/notifier/base/posix/time_posix.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/signal_thread_task.h (renamed from chrome/browser/sync/notifier/base/signal_thread_task.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/sigslotrepeater.h (renamed from chrome/browser/sync/notifier/base/sigslotrepeater.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/ssl_adapter.cc (renamed from chrome/browser/sync/notifier/base/ssl_adapter.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/ssl_adapter.h (renamed from chrome/browser/sync/notifier/base/ssl_adapter.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/static_assert.h (renamed from chrome/browser/sync/notifier/base/static_assert.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/task_pump.cc (renamed from chrome/browser/sync/notifier/base/task_pump.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/task_pump.h (renamed from chrome/browser/sync/notifier/base/task_pump.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/time.cc (renamed from chrome/browser/sync/notifier/base/time.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/time.h (renamed from chrome/browser/sync/notifier/base/time.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/time_unittest.cc (renamed from chrome/browser/sync/notifier/base/time_unittest.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/timer.cc (renamed from chrome/browser/sync/notifier/base/timer.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/timer.h (renamed from chrome/browser/sync/notifier/base/timer.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/utils.h (renamed from chrome/browser/sync/notifier/base/utils.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/win/async_network_alive_win32.cc (renamed from chrome/browser/sync/notifier/base/win/async_network_alive_win32.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/base/win/time_win32.cc (renamed from chrome/browser/sync/notifier/base/win/time_win32.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/auto_reconnect.cc (renamed from chrome/browser/sync/notifier/communicator/auto_reconnect.cc) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/auto_reconnect.h (renamed from chrome/browser/sync/notifier/communicator/auto_reconnect.h) | 10 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/connection_options.cc (renamed from chrome/browser/sync/notifier/communicator/connection_options.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/connection_options.h (renamed from chrome/browser/sync/notifier/communicator/connection_options.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/connection_settings.cc (renamed from chrome/browser/sync/notifier/communicator/connection_settings.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/connection_settings.h (renamed from chrome/browser/sync/notifier/communicator/connection_settings.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/const_communicator.h (renamed from chrome/browser/sync/notifier/communicator/const_communicator.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/login.cc (renamed from chrome/browser/sync/notifier/communicator/login.cc) | 20 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/login.h (renamed from chrome/browser/sync/notifier/communicator/login.h) | 10 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/login_failure.cc (renamed from chrome/browser/sync/notifier/communicator/login_failure.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/login_failure.h (renamed from chrome/browser/sync/notifier/communicator/login_failure.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/login_settings.cc (renamed from chrome/browser/sync/notifier/communicator/login_settings.cc) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/login_settings.h (renamed from chrome/browser/sync/notifier/communicator/login_settings.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/mailbox.cc (renamed from chrome/browser/sync/notifier/communicator/mailbox.cc) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/mailbox.h (renamed from chrome/browser/sync/notifier/communicator/mailbox.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/mailbox_unittest.cc (renamed from chrome/browser/sync/notifier/communicator/mailbox_unittest.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/product_info.cc (renamed from chrome/browser/sync/notifier/communicator/product_info.cc) | 0 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/product_info.h (renamed from chrome/browser/sync/notifier/communicator/product_info.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/single_login_attempt.cc (renamed from chrome/browser/sync/notifier/communicator/single_login_attempt.cc) | 18 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/single_login_attempt.h (renamed from chrome/browser/sync/notifier/communicator/single_login_attempt.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/ssl_socket_adapter.cc (renamed from chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/ssl_socket_adapter.h (renamed from chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/xmpp_connection_generator.cc (renamed from chrome/browser/sync/notifier/communicator/xmpp_connection_generator.cc) | 12 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/xmpp_connection_generator.h (renamed from chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/xmpp_log.cc (renamed from chrome/browser/sync/notifier/communicator/xmpp_log.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/xmpp_log.h (renamed from chrome/browser/sync/notifier/communicator/xmpp_log.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc (renamed from chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/communicator/xmpp_socket_adapter.h (renamed from chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/listen_task.cc (renamed from chrome/browser/sync/notifier/listener/listen_task.cc) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/listen_task.h (renamed from chrome/browser/sync/notifier/listener/listen_task.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/mediator_thread.h (renamed from chrome/browser/sync/notifier/listener/mediator_thread.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/mediator_thread_impl.cc (renamed from chrome/browser/sync/notifier/listener/mediator_thread_impl.cc) | 18 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/mediator_thread_impl.h (renamed from chrome/browser/sync/notifier/listener/mediator_thread_impl.h) | 12 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/mediator_thread_mock.h (renamed from chrome/browser/sync/notifier/listener/mediator_thread_mock.h) | 9 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/notification_constants.cc (renamed from chrome/browser/sync/notifier/listener/notification_constants.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/notification_constants.h (renamed from chrome/browser/sync/notifier/listener/notification_constants.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/notification_defines.h (renamed from chrome/browser/sync/notifier/listener/notification_defines.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/send_update_task.cc (renamed from chrome/browser/sync/notifier/listener/send_update_task.cc) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/send_update_task.h (renamed from chrome/browser/sync/notifier/listener/send_update_task.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/send_update_task_unittest.cc (renamed from chrome/browser/sync/notifier/listener/send_update_task_unittest.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/subscribe_task.cc (renamed from chrome/browser/sync/notifier/listener/subscribe_task.cc) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/subscribe_task.h (renamed from chrome/browser/sync/notifier/listener/subscribe_task.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/subscribe_task_unittest.cc (renamed from chrome/browser/sync/notifier/listener/subscribe_task_unittest.cc) | 5 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/talk_mediator.h (renamed from chrome/browser/sync/notifier/listener/talk_mediator.h) | 8 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/talk_mediator_impl.cc (renamed from chrome/browser/sync/notifier/listener/talk_mediator_impl.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/talk_mediator_impl.h (renamed from chrome/browser/sync/notifier/listener/talk_mediator_impl.h) | 10 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/talk_mediator_unittest.cc (renamed from chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc) | 4 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/xml_element_util.cc (renamed from chrome/browser/sync/notifier/listener/xml_element_util.cc) | 2 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/xml_element_util.h (renamed from chrome/browser/sync/notifier/listener/xml_element_util.h) | 6 | ||||
| -rw-r--r-- | chrome/common/net/notifier/listener/xml_element_util_unittest.cc (renamed from chrome/browser/sync/notifier/listener/xml_element_util_unittest.cc) | 2 |
90 files changed, 391 insertions, 331 deletions
diff --git a/build/all.gyp b/build/all.gyp index b17b3b3..de43a7c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -148,6 +148,7 @@ '../printing/printing.gyp:printing_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', @@ -163,6 +164,7 @@ '../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:startup_tests', '../chrome/chrome.gyp:sync_unit_tests', @@ -185,6 +187,7 @@ 'dependencies': [ '../base/base.gyp:base_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:sync_unit_tests', '../net/net.gyp:net_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -208,6 +211,7 @@ '../chrome/chrome.gyp:interactive_ui_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:selenium_tests', @@ -259,6 +263,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_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', @@ -283,6 +288,7 @@ '../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', diff --git a/chrome/browser/sync/engine/all_status.cc b/chrome/browser/sync/engine/all_status.cc index 592de51..983833c 100644 --- a/chrome/browser/sync/engine/all_status.cc +++ b/chrome/browser/sync/engine/all_status.cc @@ -14,11 +14,11 @@ #include "chrome/browser/sync/engine/net/server_connection_manager.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/engine/syncer_thread.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator.h" #include "chrome/browser/sync/protocol/service_constants.h" #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" namespace browser_sync { diff --git a/chrome/browser/sync/engine/auth_watcher.cc b/chrome/browser/sync/engine/auth_watcher.cc index f347a37..7b98439 100644 --- a/chrome/browser/sync/engine/auth_watcher.cc +++ b/chrome/browser/sync/engine/auth_watcher.cc @@ -10,11 +10,11 @@ #include "chrome/browser/sync/engine/authenticator.h" #include "chrome/browser/sync/engine/net/gaia_authenticator.h" #include "chrome/browser/sync/engine/net/server_connection_manager.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/util/user_settings.h" #include "chrome/common/deprecated/event_sys-inl.h" +#include "chrome/common/net/notifier/listener/talk_mediator.h" // How authentication happens: // diff --git a/chrome/browser/sync/engine/auth_watcher_unittest.cc b/chrome/browser/sync/engine/auth_watcher_unittest.cc index b34efa3..436ab80 100644 --- a/chrome/browser/sync/engine/auth_watcher_unittest.cc +++ b/chrome/browser/sync/engine/auth_watcher_unittest.cc @@ -10,9 +10,9 @@ #include "chrome/browser/sync/engine/auth_watcher.h" #include "chrome/browser/sync/engine/net/gaia_authenticator.h" #include "chrome/browser/sync/engine/net/http_return.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator_impl.h" #include "chrome/browser/sync/util/user_settings.h" #include "chrome/common/deprecated/event_sys-inl.h" +#include "chrome/common/net/notifier/listener/talk_mediator_impl.h" #include "chrome/test/sync/engine/mock_server_connection.h" #include "chrome/test/sync/engine/test_directory_setter_upper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 070d22f..1469927 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -47,9 +47,6 @@ #include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/engine/syncer_thread.h" -#include "chrome/browser/sync/notifier/listener/notification_constants.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator_impl.h" #include "chrome/browser/sync/protocol/autofill_specifics.pb.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/protocol/preference_specifics.pb.h" @@ -64,8 +61,11 @@ #include "chrome/browser/sync/util/crypto_helpers.h" #include "chrome/browser/sync/util/path_helpers.h" #include "chrome/browser/sync/util/user_settings.h" -#include "chrome/common/deprecated/event_sys.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/deprecated/event_sys.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" #if defined(OS_WIN) #pragma comment(lib, "iphlpapi.lib") @@ -976,6 +976,10 @@ class BridgedGaiaAuthenticator : public browser_sync::GaiaAuthenticator { post_factory_->Destroy(http); return true; } + + virtual int GetBackoffDelaySeconds(int current_backoff_delay) { + return AllStatus::GetRecommendedDelaySeconds(current_backoff_delay); + } private: const std::string gaia_source_; scoped_ptr<HttpPostProviderFactory> post_factory_; diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index 8e0ab5f..6da8e70 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -21,11 +21,11 @@ #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/engine/net/server_connection_manager.h" #include "chrome/browser/sync/engine/syncer.h" -#include "chrome/browser/sync/notifier/listener/notification_constants.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator_impl.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 "chrome/common/net/notifier/listener/talk_mediator.h" +#include "chrome/common/net/notifier/listener/talk_mediator_impl.h" using std::priority_queue; using std::min; diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 1b1f1b1..9db7742 100644 --- a/chrome/browser/sync/tools/sync_listen_notifications.cc +++ b/chrome/browser/sync/tools/sync_listen_notifications.cc @@ -12,11 +12,11 @@ #include "base/platform_thread.h" #include "chrome/browser/sync/notification_method.h" #include "chrome/browser/sync/sync_constants.h" -#include "chrome/browser/sync/notifier/base/task_pump.h" -#include "chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.h" -#include "chrome/browser/sync/notifier/listener/listen_task.h" -#include "chrome/browser/sync/notifier/listener/notification_constants.h" -#include "chrome/browser/sync/notifier/listener/subscribe_task.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 "talk/base/cryptstring.h" #include "talk/base/logging.h" #include "talk/base/sigslot.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 96ce0e5..48ef083 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -699,77 +699,77 @@ 'target_name': 'notifier', 'type': '<(library)', 'sources': [ - 'browser/sync/notifier/base/async_dns_lookup.cc', - 'browser/sync/notifier/base/async_dns_lookup.h', - 'browser/sync/notifier/base/async_network_alive.h', - 'browser/sync/notifier/base/fastalloc.h', - 'browser/sync/notifier/base/linux/async_network_alive_linux.cc', - 'browser/sync/notifier/base/mac/network_status_detector_task_mac.h', - 'browser/sync/notifier/base/mac/network_status_detector_task_mac.cc', - 'browser/sync/notifier/base/nethelpers.cc', - 'browser/sync/notifier/base/nethelpers.h', - 'browser/sync/notifier/base/network_status_detector_task.cc', - 'browser/sync/notifier/base/network_status_detector_task.h', - 'browser/sync/notifier/base/network_status_detector_task_mt.cc', - 'browser/sync/notifier/base/network_status_detector_task_mt.h', - 'browser/sync/notifier/base/posix/time_posix.cc', - 'browser/sync/notifier/base/signal_thread_task.h', - 'browser/sync/notifier/base/ssl_adapter.h', - 'browser/sync/notifier/base/ssl_adapter.cc', - 'browser/sync/notifier/base/static_assert.h', - 'browser/sync/notifier/base/task_pump.cc', - 'browser/sync/notifier/base/task_pump.h', - 'browser/sync/notifier/base/time.cc', - 'browser/sync/notifier/base/time.h', - 'browser/sync/notifier/base/timer.cc', - 'browser/sync/notifier/base/timer.h', - 'browser/sync/notifier/base/utils.h', - 'browser/sync/notifier/base/win/async_network_alive_win32.cc', - 'browser/sync/notifier/base/win/time_win32.cc', - 'browser/sync/notifier/communicator/auto_reconnect.cc', - 'browser/sync/notifier/communicator/auto_reconnect.h', - 'browser/sync/notifier/communicator/connection_options.cc', - 'browser/sync/notifier/communicator/connection_options.h', - 'browser/sync/notifier/communicator/connection_settings.cc', - 'browser/sync/notifier/communicator/connection_settings.h', - 'browser/sync/notifier/communicator/const_communicator.h', - 'browser/sync/notifier/communicator/login.cc', - 'browser/sync/notifier/communicator/login.h', - 'browser/sync/notifier/communicator/login_failure.cc', - 'browser/sync/notifier/communicator/login_failure.h', - 'browser/sync/notifier/communicator/login_settings.cc', - 'browser/sync/notifier/communicator/login_settings.h', - 'browser/sync/notifier/communicator/product_info.cc', - 'browser/sync/notifier/communicator/product_info.h', - 'browser/sync/notifier/communicator/single_login_attempt.cc', - 'browser/sync/notifier/communicator/single_login_attempt.h', - 'browser/sync/notifier/communicator/ssl_socket_adapter.cc', - 'browser/sync/notifier/communicator/ssl_socket_adapter.h', - 'browser/sync/notifier/communicator/xmpp_connection_generator.cc', - 'browser/sync/notifier/communicator/xmpp_connection_generator.h', - 'browser/sync/notifier/communicator/xmpp_log.cc', - 'browser/sync/notifier/communicator/xmpp_log.h', - 'browser/sync/notifier/communicator/xmpp_socket_adapter.cc', - 'browser/sync/notifier/communicator/xmpp_socket_adapter.h', - 'browser/sync/notifier/listener/listen_task.cc', - 'browser/sync/notifier/listener/listen_task.h', - 'browser/sync/notifier/listener/mediator_thread.h', - 'browser/sync/notifier/listener/mediator_thread_impl.cc', - 'browser/sync/notifier/listener/mediator_thread_impl.h', - 'browser/sync/notifier/listener/mediator_thread_mock.h', - 'browser/sync/notifier/listener/notification_constants.cc', - 'browser/sync/notifier/listener/notification_constants.h', - 'browser/sync/notifier/listener/notification_defines.h', - 'browser/sync/notifier/listener/send_update_task.cc', - 'browser/sync/notifier/listener/send_update_task.h', - 'browser/sync/notifier/base/sigslotrepeater.h', - 'browser/sync/notifier/listener/subscribe_task.cc', - 'browser/sync/notifier/listener/subscribe_task.h', - 'browser/sync/notifier/listener/talk_mediator.h', - 'browser/sync/notifier/listener/talk_mediator_impl.cc', - 'browser/sync/notifier/listener/talk_mediator_impl.h', - 'browser/sync/notifier/listener/xml_element_util.cc', - 'browser/sync/notifier/listener/xml_element_util.h', + 'common/net/notifier/base/async_dns_lookup.cc', + 'common/net/notifier/base/async_dns_lookup.h', + 'common/net/notifier/base/async_network_alive.h', + 'common/net/notifier/base/fastalloc.h', + 'common/net/notifier/base/linux/async_network_alive_linux.cc', + 'common/net/notifier/base/mac/network_status_detector_task_mac.h', + 'common/net/notifier/base/mac/network_status_detector_task_mac.cc', + 'common/net/notifier/base/nethelpers.cc', + 'common/net/notifier/base/nethelpers.h', + 'common/net/notifier/base/network_status_detector_task.cc', + 'common/net/notifier/base/network_status_detector_task.h', + 'common/net/notifier/base/network_status_detector_task_mt.cc', + 'common/net/notifier/base/network_status_detector_task_mt.h', + 'common/net/notifier/base/posix/time_posix.cc', + '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/base/time.cc', + 'common/net/notifier/base/time.h', + 'common/net/notifier/base/timer.cc', + 'common/net/notifier/base/timer.h', + 'common/net/notifier/base/utils.h', + 'common/net/notifier/base/win/async_network_alive_win32.cc', + 'common/net/notifier/base/win/time_win32.cc', + '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/login.cc', + 'common/net/notifier/communicator/login.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_log.cc', + 'common/net/notifier/communicator/xmpp_log.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': [ '..', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ad481ff..27ee306 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1665,6 +1665,63 @@ ], # conditions }, { + 'target_name': 'notifier_unit_tests', + 'type': 'executable', + 'sources': [ + 'common/net/notifier/base/mac/network_status_detector_task_mac_unittest.cc', + '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': [ + 'common', + 'debugger', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/libjingle/libjingle.gyp:libjingle', + 'test_support_unit', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '<(allocator_target)', + ], + 'link_settings': { + 'libraries': [ + '-lcrypt32.lib', + '-lws2_32.lib', + '-lsecur32.lib', + ], + }, + 'configurations': { + 'Debug_Base': { + 'msvs_settings': { + 'VCLinkerTool': { + 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', + }, + }, + }, + }, + }], + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:nss', + 'packed_resources' + ], + }], + ['OS=="linux" and chromeos==1', { + 'include_dirs': [ + '<(grit_out_dir)', + ], + }], + ], + }, + { 'target_name': 'sync_unit_tests', 'type': 'executable', 'sources': [ @@ -1683,11 +1740,6 @@ 'browser/sync/engine/syncproto_unittest.cc', 'browser/sync/engine/verify_updates_command_unittest.cc', 'browser/sync/glue/change_processor_mock.h', - 'browser/sync/notifier/base/mac/network_status_detector_task_mac_unittest.cc', - 'browser/sync/notifier/listener/talk_mediator_unittest.cc', - 'browser/sync/notifier/listener/send_update_task_unittest.cc', - 'browser/sync/notifier/listener/subscribe_task_unittest.cc', - 'browser/sync/notifier/listener/xml_element_util_unittest.cc', 'browser/sync/profile_sync_factory_mock.cc', 'browser/sync/profile_sync_factory_mock.h', 'browser/sync/sessions/ordered_commit_set_unittest.cc', diff --git a/chrome/browser/sync/notifier/DEPS b/chrome/common/net/notifier/DEPS index 95cce2f..95cce2f 100644 --- a/chrome/browser/sync/notifier/DEPS +++ b/chrome/common/net/notifier/DEPS diff --git a/chrome/browser/sync/notifier/base/async_dns_lookup.cc b/chrome/common/net/notifier/base/async_dns_lookup.cc index 33cd11d..21b7928 100644 --- a/chrome/browser/sync/notifier/base/async_dns_lookup.cc +++ b/chrome/common/net/notifier/base/async_dns_lookup.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/browser/sync/notifier/base/async_dns_lookup.h" +#include "chrome/common/net/notifier/base/async_dns_lookup.h" #include "build/build_config.h" @@ -26,7 +26,7 @@ int inet_aton(const char* cp, struct in_addr* inp); #include "base/basictypes.h" #include "base/logging.h" -#include "chrome/browser/sync/notifier/base/nethelpers.h" +#include "chrome/common/net/notifier/base/nethelpers.h" #include "talk/base/byteorder.h" #include "talk/base/common.h" #include "talk/base/socketaddress.h" diff --git a/chrome/browser/sync/notifier/base/async_dns_lookup.h b/chrome/common/net/notifier/base/async_dns_lookup.h index 937db45..276eadeb5 100644 --- a/chrome/browser/sync/notifier/base/async_dns_lookup.h +++ b/chrome/common/net/notifier/base/async_dns_lookup.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_BROWSER_SYNC_NOTIFIER_BASE_ASYNC_DNS_LOOKUP_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_ASYNC_DNS_LOOKUP_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_ASYNC_DNS_LOOKUP_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_ASYNC_DNS_LOOKUP_H_ #include <vector> @@ -48,4 +48,4 @@ class AsyncDNSLookup : public talk_base::SignalThread { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_ASYNC_DNS_LOOKUP_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_ASYNC_DNS_LOOKUP_H_ diff --git a/chrome/browser/sync/notifier/base/async_network_alive.h b/chrome/common/net/notifier/base/async_network_alive.h index 59538f3..5a2c707 100644 --- a/chrome/browser/sync/notifier/base/async_network_alive.h +++ b/chrome/common/net/notifier/base/async_network_alive.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_BROWSER_SYNC_NOTIFIER_BASE_ASYNC_NETWORK_ALIVE_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_ASYNC_NETWORK_ALIVE_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_ASYNC_NETWORK_ALIVE_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_ASYNC_NETWORK_ALIVE_H_ #include "talk/base/signalthread.h" @@ -50,4 +50,4 @@ class AsyncNetworkAlive : public talk_base::SignalThread { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_ASYNC_NETWORK_ALIVE_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_ASYNC_NETWORK_ALIVE_H_ diff --git a/chrome/browser/sync/notifier/base/fastalloc.h b/chrome/common/net/notifier/base/fastalloc.h index ac0fb46..bfd294d 100644 --- a/chrome/browser/sync/notifier/base/fastalloc.h +++ b/chrome/common/net/notifier/base/fastalloc.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_BROWSER_SYNC_NOTIFIER_BASE_FASTALLOC_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_FASTALLOC_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_FASTALLOC_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_FASTALLOC_H_ #include <assert.h> @@ -56,4 +56,4 @@ class FastAlloc { } -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_FASTALLOC_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_FASTALLOC_H_ diff --git a/chrome/browser/sync/notifier/base/linux/async_network_alive_linux.cc b/chrome/common/net/notifier/base/linux/async_network_alive_linux.cc index 0feb0ce..4accbf3 100644 --- a/chrome/browser/sync/notifier/base/linux/async_network_alive_linux.cc +++ b/chrome/common/net/notifier/base/linux/async_network_alive_linux.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/browser/sync/notifier/base/async_network_alive.h" +#include "chrome/common/net/notifier/base/async_network_alive.h" #include <sys/socket.h> #include <asm/types.h> diff --git a/chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac.cc b/chrome/common/net/notifier/base/mac/network_status_detector_task_mac.cc index fe2faa2..acebcd3 100644 --- a/chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac.cc +++ b/chrome/common/net/notifier/base/mac/network_status_detector_task_mac.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/browser/sync/notifier/base/mac/network_status_detector_task_mac.h" +#include "chrome/common/net/notifier/base/mac/network_status_detector_task_mac.h" #include <SystemConfiguration/SCNetworkReachability.h> diff --git a/chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac.h b/chrome/common/net/notifier/base/mac/network_status_detector_task_mac.h index bf10c60..c844a33 100644 --- a/chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac.h +++ b/chrome/common/net/notifier/base/mac/network_status_detector_task_mac.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_BROWSER_SYNC_NOTIFIER_BASE_MAC_NETWORK_STATUS_DETECTOR_TASK_MAC_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_MAC_NETWORK_STATUS_DETECTOR_TASK_MAC_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_MAC_NETWORK_STATUS_DETECTOR_TASK_MAC_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_MAC_NETWORK_STATUS_DETECTOR_TASK_MAC_H_ #include <CoreFoundation/CoreFoundation.h> @@ -11,7 +11,7 @@ #include "base/condition_variable.h" #include "base/lock.h" #include "base/platform_thread.h" -#include "chrome/browser/sync/notifier/base/network_status_detector_task.h" +#include "chrome/common/net/notifier/base/network_status_detector_task.h" #include "talk/base/messagequeue.h" #include "testing/gtest/include/gtest/gtest_prod.h" @@ -150,5 +150,5 @@ class NetworkStatusDetectorTaskMac : public NetworkStatusDetectorTask, } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_MAC_NETWORK_STATUS_DETECTOR_TASK_MAC_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_MAC_NETWORK_STATUS_DETECTOR_TASK_MAC_H_ diff --git a/chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac_unittest.cc b/chrome/common/net/notifier/base/mac/network_status_detector_task_mac_unittest.cc index 351d5eb..9e75b42 100644 --- a/chrome/browser/sync/notifier/base/mac/network_status_detector_task_mac_unittest.cc +++ b/chrome/common/net/notifier/base/mac/network_status_detector_task_mac_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/browser/sync/notifier/base/mac/network_status_detector_task_mac.h" +#include "chrome/common/net/notifier/base/mac/network_status_detector_task_mac.h" #include <CoreFoundation/CoreFoundation.h> diff --git a/chrome/browser/sync/notifier/base/nethelpers.cc b/chrome/common/net/notifier/base/nethelpers.cc index e342479..df93768 100644 --- a/chrome/browser/sync/notifier/base/nethelpers.cc +++ b/chrome/common/net/notifier/base/nethelpers.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "build/build_config.h" -#include "chrome/browser/sync/notifier/base/nethelpers.h" +#include "chrome/common/net/notifier/base/nethelpers.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/base/nethelpers.h b/chrome/common/net/notifier/base/nethelpers.h index 6c859a3..d53d01a 100644 --- a/chrome/browser/sync/notifier/base/nethelpers.h +++ b/chrome/common/net/notifier/base/nethelpers.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_BROWSER_SYNC_NOTIFIER_BASE_NETHELPERS_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETHELPERS_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_NETHELPERS_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_NETHELPERS_H_ #include "base/basictypes.h" @@ -24,4 +24,4 @@ void FreeHostEnt(hostent* host); } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETHELPERS_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_NETHELPERS_H_ diff --git a/chrome/browser/sync/notifier/base/network_status_detector_task.cc b/chrome/common/net/notifier/base/network_status_detector_task.cc index a061c0f..12be088 100644 --- a/chrome/browser/sync/notifier/base/network_status_detector_task.cc +++ b/chrome/common/net/notifier/base/network_status_detector_task.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/browser/sync/notifier/base/network_status_detector_task.h" +#include "chrome/common/net/notifier/base/network_status_detector_task.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/base/network_status_detector_task.h b/chrome/common/net/notifier/base/network_status_detector_task.h index cedee75..4b24a24 100644 --- a/chrome/browser/sync/notifier/base/network_status_detector_task.h +++ b/chrome/common/net/notifier/base/network_status_detector_task.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_H_ -#include "chrome/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/time.h" #include "talk/base/sigslot.h" #include "talk/base/task.h" @@ -55,4 +55,4 @@ class NetworkStatusDetectorTask : public talk_base::Task, } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_H_ diff --git a/chrome/browser/sync/notifier/base/network_status_detector_task_mt.cc b/chrome/common/net/notifier/base/network_status_detector_task_mt.cc index e9f5971..7f35a37 100644 --- a/chrome/browser/sync/notifier/base/network_status_detector_task_mt.cc +++ b/chrome/common/net/notifier/base/network_status_detector_task_mt.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/browser/sync/notifier/base/network_status_detector_task_mt.h" +#include "chrome/common/net/notifier/base/network_status_detector_task_mt.h" -#include "chrome/browser/sync/notifier/base/async_network_alive.h" -#include "chrome/browser/sync/notifier/base/signal_thread_task.h" +#include "chrome/common/net/notifier/base/async_network_alive.h" +#include "chrome/common/net/notifier/base/signal_thread_task.h" #include "talk/base/common.h" diff --git a/chrome/browser/sync/notifier/base/network_status_detector_task_mt.h b/chrome/common/net/notifier/base/network_status_detector_task_mt.h index e1812f2..ba55cd8 100644 --- a/chrome/browser/sync/notifier/base/network_status_detector_task_mt.h +++ b/chrome/common/net/notifier/base/network_status_detector_task_mt.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_MT_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_MT_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_MT_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_MT_H_ -#include "chrome/browser/sync/notifier/base/network_status_detector_task.h" +#include "chrome/common/net/notifier/base/network_status_detector_task.h" namespace notifier { @@ -31,4 +31,4 @@ class NetworkStatusDetectorTaskMT : public NetworkStatusDetectorTask { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_MT_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_NETWORK_STATUS_DETECTOR_TASK_MT_H_ diff --git a/chrome/browser/sync/notifier/base/posix/time_posix.cc b/chrome/common/net/notifier/base/posix/time_posix.cc index b3020a7..45c35c1 100644 --- a/chrome/browser/sync/notifier/base/posix/time_posix.cc +++ b/chrome/common/net/notifier/base/posix/time_posix.cc @@ -7,7 +7,7 @@ #include <string.h> #include <sys/time.h> -#include "chrome/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/time.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/base/signal_thread_task.h b/chrome/common/net/notifier/base/signal_thread_task.h index 82853a3..46f203a 100644 --- a/chrome/browser/sync/notifier/base/signal_thread_task.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_ #include "talk/base/common.h" #include "talk/base/signalthread.h" @@ -90,4 +90,4 @@ class SignalThreadTask : public talk_base::Task, } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_SIGNAL_THREAD_TASK_H_ diff --git a/chrome/browser/sync/notifier/base/sigslotrepeater.h b/chrome/common/net/notifier/base/sigslotrepeater.h index 85ab3e6..45dfba1 100644 --- a/chrome/browser/sync/notifier/base/sigslotrepeater.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_BASE_SIGSLOTREPEATER_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_SIGSLOTREPEATER_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_SIGSLOTREPEATER_H_ +#define CHROME_COMMON_NET_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_BROWSER_SYNC_NOTIFIER_BASE_SIGSLOTREPEATER_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_SIGSLOTREPEATER_H_ diff --git a/chrome/browser/sync/notifier/base/ssl_adapter.cc b/chrome/common/net/notifier/base/ssl_adapter.cc index a9218ae..9f12019 100644 --- a/chrome/browser/sync/notifier/base/ssl_adapter.cc +++ b/chrome/common/net/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/browser/sync/notifier/base/ssl_adapter.h" +#include "chrome/common/net/notifier/base/ssl_adapter.h" #if defined(OS_WIN) #include "talk/base/ssladapter.h" #else -#include "chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h" +#include "chrome/common/net/notifier/communicator/ssl_socket_adapter.h" #endif namespace notifier { diff --git a/chrome/browser/sync/notifier/base/ssl_adapter.h b/chrome/common/net/notifier/base/ssl_adapter.h index 1ce0fa9..bd39d3b 100644 --- a/chrome/browser/sync/notifier/base/ssl_adapter.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_BASE_SSL_ADAPTER_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_SSL_ADAPTER_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_SSL_ADAPTER_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_SSL_ADAPTER_H_ namespace talk_base { class AsyncSocket; @@ -29,5 +29,5 @@ class SSLAdapterSocketFactory : public SocketFactory { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_SSL_ADAPTER_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_SSL_ADAPTER_H_ diff --git a/chrome/browser/sync/notifier/base/static_assert.h b/chrome/common/net/notifier/base/static_assert.h index 12dba44..5ebf335f 100644 --- a/chrome/browser/sync/notifier/base/static_assert.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_STATIC_ASSERT_H_ +#define CHROME_COMMON_NET_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_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_STATIC_ASSERT_H_ diff --git a/chrome/browser/sync/notifier/base/task_pump.cc b/chrome/common/net/notifier/base/task_pump.cc index f220063..99254fb 100644 --- a/chrome/browser/sync/notifier/base/task_pump.cc +++ b/chrome/common/net/notifier/base/task_pump.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/notifier/base/task_pump.h" -#include "chrome/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/task_pump.h" +#include "chrome/common/net/notifier/base/time.h" #include "talk/base/common.h" #include "talk/base/thread.h" diff --git a/chrome/browser/sync/notifier/base/task_pump.h b/chrome/common/net/notifier/base/task_pump.h index 38f1689..b3dd4fa 100644 --- a/chrome/browser/sync/notifier/base/task_pump.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_BASE_TASK_PUMP_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_TASK_PUMP_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_TASK_PUMP_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_TASK_PUMP_H_ #include "talk/base/messagequeue.h" #include "talk/base/taskrunner.h" @@ -31,4 +31,4 @@ class TaskPump : public talk_base::MessageHandler, } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_TASK_PUMP_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_TASK_PUMP_H_ diff --git a/chrome/browser/sync/notifier/base/time.cc b/chrome/common/net/notifier/base/time.cc index fa67fef..1f07ebe 100644 --- a/chrome/browser/sync/notifier/base/time.cc +++ b/chrome/common/net/notifier/base/time.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/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/time.h" #include <string> #include <time.h> -#include "chrome/browser/sync/notifier/base/utils.h" +#include "chrome/common/net/notifier/base/utils.h" #include "talk/base/common.h" #include "talk/base/logging.h" diff --git a/chrome/browser/sync/notifier/base/time.h b/chrome/common/net/notifier/base/time.h index c6b6352..77a68d4 100644 --- a/chrome/browser/sync/notifier/base/time.h +++ b/chrome/common/net/notifier/base/time.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_BROWSER_SYNC_NOTIFIER_BASE_TIME_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_TIME_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_TIME_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_TIME_H_ #include <time.h> @@ -55,4 +55,4 @@ char* GetLocalTimeAsString(); } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_TIME_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_TIME_H_ diff --git a/chrome/browser/sync/notifier/base/time_unittest.cc b/chrome/common/net/notifier/base/time_unittest.cc index fc80f77..bf0962a 100644 --- a/chrome/browser/sync/notifier/base/time_unittest.cc +++ b/chrome/common/net/notifier/base/time_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/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/time.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/base/timer.cc b/chrome/common/net/notifier/base/timer.cc index 7fa20b4..96ec246 100644 --- a/chrome/browser/sync/notifier/base/timer.cc +++ b/chrome/common/net/notifier/base/timer.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/browser/sync/notifier/base/timer.h" +#include "chrome/common/net/notifier/base/timer.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/base/timer.h b/chrome/common/net/notifier/base/timer.h index c2894a1..b977d8e 100644 --- a/chrome/browser/sync/notifier/base/timer.h +++ b/chrome/common/net/notifier/base/timer.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_BROWSER_SYNC_NOTIFIER_BASE_TIMER_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_TIMER_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_TIMER_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_TIMER_H_ #include "talk/base/task.h" @@ -36,4 +36,4 @@ class Timer : private talk_base::Task { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_TIMER_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_TIMER_H_ diff --git a/chrome/browser/sync/notifier/base/utils.h b/chrome/common/net/notifier/base/utils.h index 5ca7705..fc12943 100644 --- a/chrome/browser/sync/notifier/base/utils.h +++ b/chrome/common/net/notifier/base/utils.h @@ -4,13 +4,13 @@ // // Utility functions. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_BASE_UTILS_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_BASE_UTILS_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_BASE_UTILS_H_ +#define CHROME_COMMON_NET_NOTIFIER_BASE_UTILS_H_ #include <map> #include <string> -#include "chrome/browser/sync/notifier/base/static_assert.h" +#include "chrome/common/net/notifier/base/static_assert.h" // Return error if the first argument evaluates to false. #define RET_IF_FALSE(x) do { if (!(x)) return false; } while (false) @@ -87,4 +87,4 @@ void GetMapElement(const std::map<const std::string, const T>& m, } } -#endif // CHROME_BROWSER_SYNC_NOTIFIER_BASE_UTILS_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_BASE_UTILS_H_ diff --git a/chrome/browser/sync/notifier/base/win/async_network_alive_win32.cc b/chrome/common/net/notifier/base/win/async_network_alive_win32.cc index 6e02a7f..f3978dd 100644 --- a/chrome/browser/sync/notifier/base/win/async_network_alive_win32.cc +++ b/chrome/common/net/notifier/base/win/async_network_alive_win32.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/browser/sync/notifier/base/async_network_alive.h" +#include "chrome/common/net/notifier/base/async_network_alive.h" #include <winsock2.h> #include "base/scoped_handle_win.h" -#include "chrome/browser/sync/notifier/base/utils.h" +#include "chrome/common/net/notifier/base/utils.h" #include "talk/base/common.h" #include "talk/base/criticalsection.h" #include "talk/base/logging.h" diff --git a/chrome/browser/sync/notifier/base/win/time_win32.cc b/chrome/common/net/notifier/base/win/time_win32.cc index 8b7bd90c..f839ff8 100644 --- a/chrome/browser/sync/notifier/base/win/time_win32.cc +++ b/chrome/common/net/notifier/base/win/time_win32.cc @@ -7,9 +7,9 @@ #include <time.h> #include <windows.h> -#include "chrome/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/time.h" -#include "chrome/browser/sync/notifier/base/utils.h" +#include "chrome/common/net/notifier/base/utils.h" #include "talk/base/common.h" #include "talk/base/logging.h" diff --git a/chrome/browser/sync/notifier/communicator/auto_reconnect.cc b/chrome/common/net/notifier/communicator/auto_reconnect.cc index 2b737e9..35ff386 100644 --- a/chrome/browser/sync/notifier/communicator/auto_reconnect.cc +++ b/chrome/common/net/notifier/communicator/auto_reconnect.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/browser/sync/notifier/communicator/auto_reconnect.h" +#include "chrome/common/net/notifier/communicator/auto_reconnect.h" -#include "chrome/browser/sync/notifier/base/network_status_detector_task.h" -#include "chrome/browser/sync/notifier/base/time.h" -#include "chrome/browser/sync/notifier/base/timer.h" +#include "chrome/common/net/notifier/base/network_status_detector_task.h" +#include "chrome/common/net/notifier/base/time.h" +#include "chrome/common/net/notifier/base/timer.h" #include "talk/base/common.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/communicator/auto_reconnect.h b/chrome/common/net/notifier/communicator/auto_reconnect.h index 9a1a1e2..549f322 100644 --- a/chrome/browser/sync/notifier/communicator/auto_reconnect.h +++ b/chrome/common/net/notifier/communicator/auto_reconnect.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_ #include <string> -#include "chrome/browser/sync/notifier/base/time.h" -#include "chrome/browser/sync/notifier/communicator/login.h" +#include "chrome/common/net/notifier/base/time.h" +#include "chrome/common/net/notifier/communicator/login.h" #include "talk/base/sigslot.h" namespace talk_base { @@ -72,4 +72,4 @@ extern const int kResetReconnectInfoDelaySec; } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_AUTO_RECONNECT_H_ diff --git a/chrome/browser/sync/notifier/communicator/connection_options.cc b/chrome/common/net/notifier/communicator/connection_options.cc index 8231126..1e5b6e7 100644 --- a/chrome/browser/sync/notifier/communicator/connection_options.cc +++ b/chrome/common/net/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/browser/sync/notifier/communicator/connection_options.h" +#include "chrome/common/net/notifier/communicator/connection_options.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/communicator/connection_options.h b/chrome/common/net/notifier/communicator/connection_options.h index 9e29ee6..b42023b 100644 --- a/chrome/browser/sync/notifier/communicator/connection_options.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_ #include <string> @@ -53,4 +53,4 @@ class ConnectionOptions { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_OPTIONS_H_ diff --git a/chrome/browser/sync/notifier/communicator/connection_settings.cc b/chrome/common/net/notifier/communicator/connection_settings.cc index 95193fc..c4d29a4 100644 --- a/chrome/browser/sync/notifier/communicator/connection_settings.cc +++ b/chrome/common/net/notifier/communicator/connection_settings.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "chrome/browser/sync/notifier/communicator/connection_settings.h" +#include "chrome/common/net/notifier/communicator/connection_settings.h" #include "talk/base/helpers.h" #include "talk/xmpp/xmppclientsettings.h" diff --git a/chrome/browser/sync/notifier/communicator/connection_settings.h b/chrome/common/net/notifier/communicator/connection_settings.h index ac7f357..fc5ef4c 100644 --- a/chrome/browser/sync/notifier/communicator/connection_settings.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_ #include <deque> #include <string> @@ -73,4 +73,4 @@ class ConnectionSettingsList { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONNECTION_SETTINGS_H_ diff --git a/chrome/browser/sync/notifier/communicator/const_communicator.h b/chrome/common/net/notifier/communicator/const_communicator.h index 5b78bd1..0b0a18a 100644 --- a/chrome/browser/sync/notifier/communicator/const_communicator.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_ namespace notifier { // The default port for jabber/xmpp communications. const int kDefaultXmppPort = 5222; } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_CONST_COMMUNICATOR_H_ diff --git a/chrome/browser/sync/notifier/communicator/login.cc b/chrome/common/net/notifier/communicator/login.cc index 9da7f56..0a8f12c 100644 --- a/chrome/browser/sync/notifier/communicator/login.cc +++ b/chrome/common/net/notifier/communicator/login.cc @@ -4,16 +4,16 @@ #include <string> -#include "chrome/browser/sync/notifier/communicator/login.h" - -#include "chrome/browser/sync/notifier/base/network_status_detector_task.h" -#include "chrome/browser/sync/notifier/base/time.h" -#include "chrome/browser/sync/notifier/base/timer.h" -#include "chrome/browser/sync/notifier/communicator/auto_reconnect.h" -#include "chrome/browser/sync/notifier/communicator/connection_options.h" -#include "chrome/browser/sync/notifier/communicator/login_settings.h" -#include "chrome/browser/sync/notifier/communicator/product_info.h" -#include "chrome/browser/sync/notifier/communicator/single_login_attempt.h" +#include "chrome/common/net/notifier/communicator/login.h" + +#include "chrome/common/net/notifier/base/network_status_detector_task.h" +#include "chrome/common/net/notifier/base/time.h" +#include "chrome/common/net/notifier/base/timer.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 "talk/base/common.h" #include "talk/base/firewallsocketserver.h" #include "talk/base/logging.h" diff --git a/chrome/browser/sync/notifier/communicator/login.h b/chrome/common/net/notifier/communicator/login.h index de90a1b..6ee8008 100644 --- a/chrome/browser/sync/notifier/communicator/login.h +++ b/chrome/common/net/notifier/communicator/login.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_ #include <string> -#include "chrome/browser/sync/notifier/base/sigslotrepeater.h" -#include "chrome/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/sigslotrepeater.h" +#include "chrome/common/net/notifier/base/time.h" #include "talk/base/proxyinfo.h" #include "talk/base/scoped_ptr.h" #include "talk/base/sigslot.h" @@ -151,4 +151,4 @@ class Login : public sigslot::has_slots<> { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_H_ diff --git a/chrome/browser/sync/notifier/communicator/login_failure.cc b/chrome/common/net/notifier/communicator/login_failure.cc index c10a35b..22c0652 100644 --- a/chrome/browser/sync/notifier/communicator/login_failure.cc +++ b/chrome/common/net/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/browser/sync/notifier/communicator/login_failure.h" +#include "chrome/common/net/notifier/communicator/login_failure.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/communicator/login_failure.h b/chrome/common/net/notifier/communicator/login_failure.h index 886f8da..89c629b 100644 --- a/chrome/browser/sync/notifier/communicator/login_failure.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_ #include "talk/base/common.h" #include "talk/xmpp/xmppengine.h" @@ -50,4 +50,4 @@ class LoginFailure { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_FAILURE_H_ diff --git a/chrome/browser/sync/notifier/communicator/login_settings.cc b/chrome/common/net/notifier/communicator/login_settings.cc index 085bf31..06ea8e7 100644 --- a/chrome/browser/sync/notifier/communicator/login_settings.cc +++ b/chrome/common/net/notifier/communicator/login_settings.cc @@ -4,10 +4,10 @@ #include <string> -#include "chrome/browser/sync/notifier/communicator/login_settings.h" +#include "chrome/common/net/notifier/communicator/login_settings.h" -#include "chrome/browser/sync/notifier/communicator/connection_options.h" -#include "chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h" +#include "chrome/common/net/notifier/communicator/connection_options.h" +#include "chrome/common/net/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/browser/sync/notifier/communicator/login_settings.h b/chrome/common/net/notifier/communicator/login_settings.h index 331d341..2f05729 100644 --- a/chrome/browser/sync/notifier/communicator/login_settings.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_ #include <string> -#include "chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h" +#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h" #include "talk/base/scoped_ptr.h" namespace buzz { @@ -88,4 +88,4 @@ class LoginSettings { DISALLOW_COPY_AND_ASSIGN(LoginSettings); }; } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_ diff --git a/chrome/browser/sync/notifier/communicator/mailbox.cc b/chrome/common/net/notifier/communicator/mailbox.cc index 5cabf04..aaf8db8 100644 --- a/chrome/browser/sync/notifier/communicator/mailbox.cc +++ b/chrome/common/net/notifier/communicator/mailbox.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/browser/sync/notifier/communicator/mailbox.h" +#include "chrome/common/net/notifier/communicator/mailbox.h" #include <assert.h> #include <stdlib.h> @@ -10,9 +10,9 @@ #include <stack> #include <vector> -#include "chrome/browser/sync/notifier/base/string.h" -#include "chrome/browser/sync/notifier/base/utils.h" -#include "chrome/browser/sync/notifier/communicator/xml_parse_helpers.h" +#include "chrome/common/net/notifier/base/string.h" +#include "chrome/common/net/notifier/base/utils.h" +#include "chrome/common/net/notifier/communicator/xml_parse_helpers.h" #include "talk/base/basictypes.h" #include "talk/base/common.h" #include "talk/base/stringutils.h" diff --git a/chrome/browser/sync/notifier/communicator/mailbox.h b/chrome/common/net/notifier/communicator/mailbox.h index ae44cb3..9aea0c7 100644 --- a/chrome/browser/sync/notifier/communicator/mailbox.h +++ b/chrome/common/net/notifier/communicator/mailbox.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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_MAILBOX_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_MAILBOX_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_MAILBOX_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_MAILBOX_H_ #include <set> #include <string> @@ -163,4 +163,4 @@ std::string GetSenderHtml(const MailSenderList& sender_list, } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_MAILBOX_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_MAILBOX_H_ diff --git a/chrome/browser/sync/notifier/communicator/mailbox_unittest.cc b/chrome/common/net/notifier/communicator/mailbox_unittest.cc index 5c08ce1..7230766 100644 --- a/chrome/browser/sync/notifier/communicator/mailbox_unittest.cc +++ b/chrome/common/net/notifier/communicator/mailbox_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/browser/sync/notifier/communicator/mailbox.h" +#include "chrome/common/net/notifier/communicator/mailbox.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/communicator/product_info.cc b/chrome/common/net/notifier/communicator/product_info.cc index c1deafb..c1deafb 100644 --- a/chrome/browser/sync/notifier/communicator/product_info.cc +++ b/chrome/common/net/notifier/communicator/product_info.cc diff --git a/chrome/browser/sync/notifier/communicator/product_info.h b/chrome/common/net/notifier/communicator/product_info.h index 04e3c46..6144122 100644 --- a/chrome/browser/sync/notifier/communicator/product_info.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_ #include <string> @@ -12,4 +12,4 @@ std::string GetUserAgentString(); std::string GetProductSignature(); } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_PRODUCT_INFO_H_ diff --git a/chrome/browser/sync/notifier/communicator/single_login_attempt.cc b/chrome/common/net/notifier/communicator/single_login_attempt.cc index ff53d68..939a07b 100644 --- a/chrome/browser/sync/notifier/communicator/single_login_attempt.cc +++ b/chrome/common/net/notifier/communicator/single_login_attempt.cc @@ -6,17 +6,17 @@ #include <string> #include <vector> -#include "chrome/browser/sync/notifier/communicator/single_login_attempt.h" +#include "chrome/common/net/notifier/communicator/single_login_attempt.h" #include "base/logging.h" -#include "chrome/browser/sync/notifier/communicator/connection_options.h" -#include "chrome/browser/sync/notifier/communicator/connection_settings.h" -#include "chrome/browser/sync/notifier/communicator/const_communicator.h" -#include "chrome/browser/sync/notifier/communicator/login_failure.h" -#include "chrome/browser/sync/notifier/communicator/login_settings.h" -#include "chrome/browser/sync/notifier/communicator/product_info.h" -#include "chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h" -#include "chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.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/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 "talk/base/asynchttprequest.h" #include "talk/base/firewallsocketserver.h" #include "talk/base/signalthread.h" diff --git a/chrome/browser/sync/notifier/communicator/single_login_attempt.h b/chrome/common/net/notifier/communicator/single_login_attempt.h index 388260c..0f4ac91 100644 --- a/chrome/browser/sync/notifier/communicator/single_login_attempt.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_ #include <string> -#include "chrome/browser/sync/notifier/communicator/login.h" +#include "chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SINGLE_LOGIN_ATTEMPT_H_ diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc b/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc index b0b7776..1426864 100644 --- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc +++ b/chrome/common/net/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/browser/sync/notifier/communicator/ssl_socket_adapter.h" +#include "chrome/common/net/notifier/communicator/ssl_socket_adapter.h" #include "base/compiler_specific.h" #include "base/message_loop.h" diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h b/chrome/common/net/notifier/communicator/ssl_socket_adapter.h index 59cdb08..bbb0961 100644 --- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_ +#define CHROME_COMMON_NET_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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_SSL_SOCKET_ADAPTER_H_ diff --git a/chrome/browser/sync/notifier/communicator/xmpp_connection_generator.cc b/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc index 2f28a59..ff4355c 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_connection_generator.cc +++ b/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc @@ -10,16 +10,16 @@ // for connection in connection_list // yield connection -#include "chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h" +#include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h" #include <vector> #include "base/logging.h" -#include "chrome/browser/sync/notifier/base/async_dns_lookup.h" -#include "chrome/browser/sync/notifier/base/signal_thread_task.h" -#include "chrome/browser/sync/notifier/communicator/connection_options.h" -#include "chrome/browser/sync/notifier/communicator/connection_settings.h" -#include "chrome/browser/sync/notifier/communicator/product_info.h" +#include "chrome/common/net/notifier/base/async_dns_lookup.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 "talk/base/autodetectproxy.h" #include "talk/base/httpcommon-inl.h" #include "talk/base/task.h" diff --git a/chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h b/chrome/common/net/notifier/communicator/xmpp_connection_generator.h index e0bdd50..47a2e40 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_ #include <vector> @@ -82,4 +82,4 @@ class XmppConnectionGenerator : public sigslot::has_slots<> { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_CONNECTION_GENERATOR_H_ diff --git a/chrome/browser/sync/notifier/communicator/xmpp_log.cc b/chrome/common/net/notifier/communicator/xmpp_log.cc index 4d30bea..27b0cf96 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_log.cc +++ b/chrome/common/net/notifier/communicator/xmpp_log.cc @@ -4,13 +4,13 @@ #if LOGGING -#include "chrome/browser/sync/notifier/communicator/xmpp_log.h" +#include "chrome/common/net/notifier/communicator/xmpp_log.h" #include <iomanip> #include <string> #include <vector> -#include "chrome/browser/sync/notifier/base/time.h" +#include "chrome/common/net/notifier/base/time.h" #include "talk/base/common.h" #include "talk/base/logging.h" diff --git a/chrome/browser/sync/notifier/communicator/xmpp_log.h b/chrome/common/net/notifier/communicator/xmpp_log.h index cb4439d..1d6edac 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_log.h +++ b/chrome/common/net/notifier/communicator/xmpp_log.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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_LOG_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_LOG_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_LOG_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_LOG_H_ #if LOGGING @@ -43,4 +43,4 @@ class XmppLog : public sigslot::has_slots<> { #endif // if LOGGING -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_LOG_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_LOG_H_ diff --git a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc b/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc index e67e5dd..281a6179 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc +++ b/chrome/common/net/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/browser/sync/notifier/communicator/xmpp_socket_adapter.h" +#include "chrome/common/net/notifier/communicator/xmpp_socket_adapter.h" #include <iomanip> #include <string> #include "base/logging.h" -#include "chrome/browser/sync/notifier/base/ssl_adapter.h" -#include "chrome/browser/sync/notifier/communicator/product_info.h" +#include "chrome/common/net/notifier/base/ssl_adapter.h" +#include "chrome/common/net/notifier/communicator/product_info.h" #include "talk/base/byteorder.h" #include "talk/base/common.h" #include "talk/base/firewallsocketserver.h" diff --git a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.h b/chrome/common/net/notifier/communicator/xmpp_socket_adapter.h index af44246..e818173 100644 --- a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_ +#define CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_ #include <string> @@ -84,4 +84,4 @@ class XmppSocketAdapter : public buzz::AsyncSocket, } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_COMMUNICATOR_XMPP_SOCKET_ADAPTER_H_ diff --git a/chrome/browser/sync/notifier/listener/listen_task.cc b/chrome/common/net/notifier/listener/listen_task.cc index 8c9b949..3f47163 100644 --- a/chrome/browser/sync/notifier/listener/listen_task.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/listen_task.h" +#include "chrome/common/net/notifier/listener/listen_task.h" #include "base/logging.h" -#include "chrome/browser/sync/notifier/listener/notification_constants.h" -#include "chrome/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/notification_constants.h" +#include "chrome/common/net/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/browser/sync/notifier/listener/listen_task.h b/chrome/common/net/notifier/listener/listen_task.h index b01dd80..c4f2a6fa 100644 --- a/chrome/browser/sync/notifier/listener/listen_task.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_LISTEN_TASK_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_LISTEN_TASK_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_LISTEN_TASK_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_LISTEN_TASK_H_ -#include "chrome/browser/sync/notifier/listener/notification_defines.h" +#include "chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_LISTEN_TASK_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_LISTEN_TASK_H_ diff --git a/chrome/browser/sync/notifier/listener/mediator_thread.h b/chrome/common/net/notifier/listener/mediator_thread.h index 9e3b33a..5c460a0f 100644 --- a/chrome/browser/sync/notifier/listener/mediator_thread.h +++ b/chrome/common/net/notifier/listener/mediator_thread.h @@ -5,14 +5,14 @@ // These methods should post messages to a queue which a different thread will // later come back and read from. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_ #include <string> #include <vector> #include "base/logging.h" -#include "chrome/browser/sync/notifier/listener/notification_defines.h" +#include "chrome/common/net/notifier/listener/notification_defines.h" #include "talk/base/sigslot.h" #include "talk/xmpp/xmppclientsettings.h" @@ -52,4 +52,4 @@ class MediatorThread { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_H_ diff --git a/chrome/browser/sync/notifier/listener/mediator_thread_impl.cc b/chrome/common/net/notifier/listener/mediator_thread_impl.cc index ad5d47e..7ab5150 100644 --- a/chrome/browser/sync/notifier/listener/mediator_thread_impl.cc +++ b/chrome/common/net/notifier/listener/mediator_thread_impl.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/notifier/listener/mediator_thread_impl.h" +#include "chrome/common/net/notifier/listener/mediator_thread_impl.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/platform_thread.h" -#include "chrome/browser/sync/notifier/base/async_dns_lookup.h" -#include "chrome/browser/sync/notifier/base/task_pump.h" -#include "chrome/browser/sync/notifier/communicator/connection_options.h" -#include "chrome/browser/sync/notifier/communicator/const_communicator.h" -#include "chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h" -#include "chrome/browser/sync/notifier/listener/listen_task.h" -#include "chrome/browser/sync/notifier/listener/send_update_task.h" -#include "chrome/browser/sync/notifier/listener/subscribe_task.h" +#include "chrome/common/net/notifier/base/async_dns_lookup.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 "talk/base/thread.h" #include "talk/xmpp/xmppclient.h" #include "talk/xmpp/xmppclientsettings.h" diff --git a/chrome/browser/sync/notifier/listener/mediator_thread_impl.h b/chrome/common/net/notifier/listener/mediator_thread_impl.h index 6d14241..5517529 100644 --- a/chrome/browser/sync/notifier/listener/mediator_thread_impl.h +++ b/chrome/common/net/notifier/listener/mediator_thread_impl.h @@ -17,17 +17,17 @@ // m.Logout(); // delete m; // Also stops the thread. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_ #include <string> #include <vector> #include "base/logging.h" #include "base/scoped_ptr.h" -#include "chrome/browser/sync/notifier/communicator/login.h" -#include "chrome/browser/sync/notifier/communicator/login_failure.h" -#include "chrome/browser/sync/notifier/listener/mediator_thread.h" +#include "chrome/common/net/notifier/communicator/login.h" +#include "chrome/common/net/notifier/communicator/login_failure.h" +#include "chrome/common/net/notifier/listener/mediator_thread.h" #include "talk/base/sigslot.h" #include "talk/base/thread.h" #include "talk/xmpp/xmppclientsettings.h" @@ -149,4 +149,4 @@ class MediatorThreadImpl } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_ diff --git a/chrome/browser/sync/notifier/listener/mediator_thread_mock.h b/chrome/common/net/notifier/listener/mediator_thread_mock.h index 3257563..4df36df 100644 --- a/chrome/browser/sync/notifier/listener/mediator_thread_mock.h +++ b/chrome/common/net/notifier/listener/mediator_thread_mock.h @@ -6,14 +6,13 @@ // It's very primitive, and it would have been better to use gmock, except // that gmock is only for linux. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_ #include <string> #include <vector> -#include "chrome/browser/sync/notifier/listener/mediator_thread.h" -#include "chrome/browser/sync/notification_method.h" +#include "chrome/common/net/notifier/listener/mediator_thread.h" #include "talk/xmpp/xmppclientsettings.h" namespace notifier { @@ -79,4 +78,4 @@ class MockMediatorThread : public MediatorThread { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_MEDIATOR_THREAD_MOCK_H_ diff --git a/chrome/browser/sync/notifier/listener/notification_constants.cc b/chrome/common/net/notifier/listener/notification_constants.cc index fe1bbe1..cbfbe3f 100644 --- a/chrome/browser/sync/notifier/listener/notification_constants.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/notification_constants.h" +#include "chrome/common/net/notifier/listener/notification_constants.h" namespace notifier { diff --git a/chrome/browser/sync/notifier/listener/notification_constants.h b/chrome/common/net/notifier/listener/notification_constants.h index 1d5be72..566dc90 100644 --- a/chrome/browser/sync/notifier/listener/notification_constants.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_ namespace notifier { @@ -11,4 +11,4 @@ extern const char kNotifierNamespace[]; } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_CONSTANTS_H_ diff --git a/chrome/browser/sync/notifier/listener/notification_defines.h b/chrome/common/net/notifier/listener/notification_defines.h index 8bdc852..a2c0b42 100644 --- a/chrome/browser/sync/notifier/listener/notification_defines.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_ #include <string> @@ -30,5 +30,5 @@ struct OutgoingNotificationData { bool write_to_cache_only; }; -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_NOTIFICATION_DEFINES_H_ diff --git a/chrome/browser/sync/notifier/listener/send_update_task.cc b/chrome/common/net/notifier/listener/send_update_task.cc index deddc56..f1deb73 100644 --- a/chrome/browser/sync/notifier/listener/send_update_task.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/send_update_task.h" +#include "chrome/common/net/notifier/listener/send_update_task.h" #include <string> #include "base/logging.h" #include "base/scoped_ptr.h" -#include "chrome/browser/sync/notifier/listener/notification_constants.h" -#include "chrome/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/notification_constants.h" +#include "chrome/common/net/notifier/listener/xml_element_util.h" #include "talk/xmllite/qname.h" #include "talk/xmpp/xmppclient.h" #include "talk/xmpp/xmppconstants.h" diff --git a/chrome/browser/sync/notifier/listener/send_update_task.h b/chrome/common/net/notifier/listener/send_update_task.h index 5c5491a..4ee5df7 100644 --- a/chrome/browser/sync/notifier/listener/send_update_task.h +++ b/chrome/common/net/notifier/listener/send_update_task.h @@ -4,12 +4,12 @@ // // Methods for sending the update stanza to notify peers via xmpp. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_ #include <string> -#include "chrome/browser/sync/notifier/listener/notification_defines.h" +#include "chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_SEND_UPDATE_TASK_H_ diff --git a/chrome/browser/sync/notifier/listener/send_update_task_unittest.cc b/chrome/common/net/notifier/listener/send_update_task_unittest.cc index 8b69210..85c1ba8 100644 --- a/chrome/browser/sync/notifier/listener/send_update_task_unittest.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/send_update_task.h" +#include "chrome/common/net/notifier/listener/send_update_task.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/xml_element_util.h" #include "talk/xmpp/jid.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/listener/subscribe_task.cc b/chrome/common/net/notifier/listener/subscribe_task.cc index 31bca4f0..8fc2c79 100644 --- a/chrome/browser/sync/notifier/listener/subscribe_task.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/subscribe_task.h" +#include "chrome/common/net/notifier/listener/subscribe_task.h" #include <string> #include "base/logging.h" -#include "chrome/browser/sync/notifier/listener/notification_constants.h" -#include "chrome/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/notification_constants.h" +#include "chrome/common/net/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/browser/sync/notifier/listener/subscribe_task.h b/chrome/common/net/notifier/listener/subscribe_task.h index 9fb3919..5aa0685 100644 --- a/chrome/browser/sync/notifier/listener/subscribe_task.h +++ b/chrome/common/net/notifier/listener/subscribe_task.h @@ -6,8 +6,8 @@ // stanza which establishes the endpoint and directs future notifications to be // pushed. -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_ #include <string> #include <vector> @@ -48,4 +48,4 @@ class SubscribeTask : public buzz::XmppTask { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_SUBSCRIBE_TASK_H_ diff --git a/chrome/browser/sync/notifier/listener/subscribe_task_unittest.cc b/chrome/common/net/notifier/listener/subscribe_task_unittest.cc index 8c94ced..cda6b75 100644 --- a/chrome/browser/sync/notifier/listener/subscribe_task_unittest.cc +++ b/chrome/common/net/notifier/listener/subscribe_task_unittest.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/notifier/listener/subscribe_task.h" +#include "chrome/common/net/notifier/listener/subscribe_task.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/browser/sync/notification_method.h" -#include "chrome/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/xml_element_util.h" #include "talk/xmpp/jid.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/listener/talk_mediator.h b/chrome/common/net/notifier/listener/talk_mediator.h index 3f0853d..5580691 100644 --- a/chrome/browser/sync/notifier/listener/talk_mediator.h +++ b/chrome/common/net/notifier/listener/talk_mediator.h @@ -13,12 +13,12 @@ // ... // mediator.Logout(); -#ifndef CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_TALK_MEDIATOR_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_TALK_MEDIATOR_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_H_ #include <string> -#include "chrome/browser/sync/notifier/listener/notification_defines.h" +#include "chrome/common/net/notifier/listener/notification_defines.h" #include "chrome/common/deprecated/event_sys.h" namespace notifier { @@ -73,4 +73,4 @@ class TalkMediator { } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_TALK_MEDIATOR_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_H_ diff --git a/chrome/browser/sync/notifier/listener/talk_mediator_impl.cc b/chrome/common/net/notifier/listener/talk_mediator_impl.cc index eeccfc1..55eb815 100644 --- a/chrome/browser/sync/notifier/listener/talk_mediator_impl.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/talk_mediator_impl.h" +#include "chrome/common/net/notifier/listener/talk_mediator_impl.h" #include "base/logging.h" #include "base/singleton.h" -#include "chrome/browser/sync/notifier/listener/mediator_thread_impl.h" +#include "chrome/common/net/notifier/listener/mediator_thread_impl.h" #include "chrome/common/deprecated/event_sys-inl.h" #include "talk/base/cryptstring.h" #include "talk/base/ssladapter.h" diff --git a/chrome/browser/sync/notifier/listener/talk_mediator_impl.h b/chrome/common/net/notifier/listener/talk_mediator_impl.h index e304ea3..7c701ed 100644 --- a/chrome/browser/sync/notifier/listener/talk_mediator_impl.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_ +#define CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_ #include <string> #include <vector> #include "base/lock.h" #include "base/scoped_ptr.h" -#include "chrome/browser/sync/notifier/listener/mediator_thread.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator.h" +#include "chrome/common/net/notifier/listener/mediator_thread.h" +#include "chrome/common/net/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 @@ -112,4 +112,4 @@ class TalkMediatorImpl } // namespace notifier -#endif // CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_TALK_MEDIATOR_IMPL_H_ diff --git a/chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc b/chrome/common/net/notifier/listener/talk_mediator_unittest.cc index bca9d19..dd50d64 100644 --- a/chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc +++ b/chrome/common/net/notifier/listener/talk_mediator_unittest.cc @@ -5,8 +5,8 @@ #include <string> #include "base/logging.h" -#include "chrome/browser/sync/notifier/listener/mediator_thread_mock.h" -#include "chrome/browser/sync/notifier/listener/talk_mediator_impl.h" +#include "chrome/common/net/notifier/listener/mediator_thread_mock.h" +#include "chrome/common/net/notifier/listener/talk_mediator_impl.h" #include "chrome/common/deprecated/event_sys-inl.h" #include "talk/xmpp/xmppengine.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/listener/xml_element_util.cc b/chrome/common/net/notifier/listener/xml_element_util.cc index 90bcb89..b9403f6 100644 --- a/chrome/browser/sync/notifier/listener/xml_element_util.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/xml_element_util.h" #include <sstream> #include <string> diff --git a/chrome/browser/sync/notifier/listener/xml_element_util.h b/chrome/common/net/notifier/listener/xml_element_util.h index 5058dab..a63077a 100644 --- a/chrome/browser/sync/notifier/listener/xml_element_util.h +++ b/chrome/common/net/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_BROWSER_SYNC_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_ -#define CHROME_BROWSER_SYNC_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_ +#ifndef CHROME_COMMON_NET_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_ +#define CHROME_COMMON_NET_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_BROWSER_SYNC_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_ +#endif // CHROME_COMMON_NET_NOTIFIER_LISTENER_XML_ELEMENT_UTIL_H_ diff --git a/chrome/browser/sync/notifier/listener/xml_element_util_unittest.cc b/chrome/common/net/notifier/listener/xml_element_util_unittest.cc index 19d6ad6..ab1d823 100644 --- a/chrome/browser/sync/notifier/listener/xml_element_util_unittest.cc +++ b/chrome/common/net/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/browser/sync/notifier/listener/xml_element_util.h" +#include "chrome/common/net/notifier/listener/xml_element_util.h" #include <sstream> #include <string> |