Revert of Move some sync/notifier to components/invalidation (https://codereview.chromium.org/294123004/)

Reason for revert:
Passed the CQ but broke the buildbot.

Original issue's description:
> Move some sync/notifier to components/invalidation
> 
> Moves many of the files in sync/notifier to components/invalidation.
> 
> This change does not introduce any new dependencies.  The relevant
> dependency rules both before and after this change should be:
> - chrome/browser/invalidation and chrome in general depend on
>   components/invalidation.
> - components/invalidation depends on sync/notifier and sync in
>   general.
> - sync/notifier, components/invalidation, and various parts of
>   chrome all depend on sync/internal_api/public.
> 
> The eventual goal is to move all of sync/notifier into
> components/invalidation.  The invalidation-related parts of
> sync/internal_api/public should be moved to components/invalidation,
> too.  This will allow us to remove the deopendencies from
> components/invalidation to sync, and remove sync's dependencies on
> cacheinvalidation and libjingle.
> 
> This change is a regression in terms of shared library componentization.
> the files in the sync/notifier folder could be built as a shared
> library.  The files in compononents/invalidation do not support this
> yet.  The SYNC_EXPORT declarations in the moved files have been changed
> to INVALIDATION_EXPORT so as to not lose this information, but the
> macros are currently #defined to no-ops.
> 
> This change does not attempt to rename any classes or namespaces.
> Many of the files ported from sync/notifier still use the syncer
> namespace.  Some, like SyncSystemResources, still have names tied
> to their sync heritage.  This will be addressed in future CLs.
> 
> Some non-trivial or non-obvious changes include:
> - invalidator_state.h was moved to sync/internal_api/public/base so it
> could be shared by both sync/ and components/invalidation.  This should
> be fixed in a future CL.
> - FromNotifierReason was split out of invalidator_state.h and moved to
> the newly-created components/invalidator_reason_util.h
> 
> TBR=zea,rtenneti,mallinath,dcheng
> BUG=259559
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=274350

TBR=pavely@chromium.org,dcheng@chromium.org,zea@chromium.org,rtenneti@chromium.org,mallinath@chromium.org,maniscalco@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=259559

Review URL: https://codereview.chromium.org/308413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274364 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 5 deletions

diff --git a/sync/tools/DEPS b/sync/tools/DEPS
index ac34026..322ec26 100644
--- a/sync/tools/DEPS
+++ b/sync/tools/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+components/invalidation",
   "+jingle/notifier/base",
   "+net",
   "+sync/internal_api/public",
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index a5890cf..8edd6fa 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -20,7 +20,6 @@
 #include "base/rand_util.h"
 #include "base/task_runner.h"
 #include "base/threading/thread.h"
-#include "components/invalidation/non_blocking_invalidator.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
@@ -42,6 +41,7 @@
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/js/js_event_details.h"
 #include "sync/js/js_event_handler.h"
+#include "sync/notifier/non_blocking_invalidator.h"
 #include "sync/test/fake_encryptor.h"
 #include "sync/tools/null_invalidation_state_tracker.h"
 
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index e924e53..6a9a505 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -15,7 +15,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/threading/thread.h"
-#include "components/invalidation/non_blocking_invalidator.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
@@ -28,6 +27,7 @@
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
+#include "sync/notifier/non_blocking_invalidator.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/tools/null_invalidation_state_tracker.h"
 
diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp
index 20ca8ec..7cc8352 100644
--- a/sync/tools/sync_tools.gyp
+++ b/sync/tools/sync_tools.gyp
@@ -39,7 +39,6 @@
     ],
     'dependencies': [
       '../../base/base.gyp:base',
-      '../../components/components.gyp:invalidation',
       '../../jingle/jingle.gyp:notifier',
       '../../net/net.gyp:net',
       '../../net/net.gyp:net_test_support',
@@ -60,7 +59,6 @@
     ],
     'dependencies': [
       '../../base/base.gyp:base',
-      '../../components/components.gyp:invalidation',
       '../../jingle/jingle.gyp:notifier',
       '../../net/net.gyp:net',
       '../../net/net.gyp:net_test_support',