| Index: sync/tools/sync_listen_notifications.cc
|
| diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
|
| index 7a3279b63eb43ca34114b6245bd58fedfe8089f4..996647fc27dec191a7c79f1e9b6fea7a47c62e1a 100644
|
| --- a/sync/tools/sync_listen_notifications.cc
|
| +++ b/sync/tools/sync_listen_notifications.cc
|
| @@ -15,7 +15,11 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/rand_util.h"
|
| #include "base/threading/thread.h"
|
| +#include "components/invalidation/invalidation_handler.h"
|
| +#include "components/invalidation/invalidation_state_tracker.h"
|
| +#include "components/invalidation/invalidator.h"
|
| #include "components/invalidation/non_blocking_invalidator.h"
|
| +#include "components/invalidation/object_id_invalidation_map.h"
|
| #include "jingle/notifier/base/notification_method.h"
|
| #include "jingle/notifier/base/notifier_options.h"
|
| #include "net/base/host_port_pair.h"
|
| @@ -23,12 +27,8 @@
|
| #include "net/dns/host_resolver.h"
|
| #include "net/http/transport_security_state.h"
|
| #include "net/url_request/url_request_test_util.h"
|
| +#include "sync/internal_api/public/base/invalidation_util.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/notifier/invalidation_handler.h"
|
| -#include "sync/notifier/invalidation_state_tracker.h"
|
| -#include "sync/notifier/invalidation_util.h"
|
| -#include "sync/notifier/invalidator.h"
|
| -#include "sync/notifier/object_id_invalidation_map.h"
|
| #include "sync/tools/null_invalidation_state_tracker.h"
|
|
|
| #if defined(OS_MACOSX)
|
|
|