Revert 208315 "Make use of InvalidationService"

> Make use of InvalidationService
> 
> The InvalidationService was introduced r199520.  That commit added the
> InvalidationService interface and several implementations of it, but
> made no use of the new code.  This commit builds on that work.
> 
> Up until now, TICL invalidations were handled on the sync thread.  The
> related objects were instantiated and owned by the SyncBackendHost and
> SyncManager.  All requests to update the set of object registrations had
> to be passed to the sync thread.  Components that wanted to receive
> invalidations but were not part of sync had to route their communication
> with the invalidations server through ProfileSyncService to get to the
> sync thread.  Things were a bit different on Android, but the system
> still tried to pretend that invalidations were owned by the sync thread.
> 
> The new InvalidationService implementation is a ProfileKeyedService that
> is mostly independent from sync.  It still relies on sync to manage sign
> in and fetch the appropriate auth tokens.  However, it's now much easier
> for components outside of sync to communication with the invalidations
> server.
> 
> The new system allows us to remove a lot of invalidations-related code
> from the ProfileSyncService, SyncBackendHost and SyncManager.  Sync is
> now just one of many clients of the InvalidationService.  The
> SyncBackendHost is responsible for forwarding messages back and forth
> between the InvalidationService and the sync thread.
> 
> TBR=sky,erg
> BUG=124137
> 
> Review URL: https://chromiumcodereview.appspot.com/15580002

TBR=rlarocque@chromium.org

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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/chrome_to_mobile_service_factory.cc b/chrome/browser/chrome_to_mobile_service_factory.cc
index 8b1c0c4..3c1150a 100644
--- a/chrome/browser/chrome_to_mobile_service_factory.cc
+++ b/chrome/browser/chrome_to_mobile_service_factory.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
 
 #include "chrome/browser/chrome_to_mobile_service.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service_factory.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
 // static
@@ -36,7 +36,7 @@ ChromeToMobileServiceFactory::ChromeToMobileServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "ChromeToMobileService",
         BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(invalidation::InvalidationServiceFactory::GetInstance());
+  DependsOn(ProfileSyncServiceFactory::GetInstance());
   DependsOn(TokenServiceFactory::GetInstance());
   // TODO(msw): Uncomment this once it exists.
   // DependsOn(PrefServiceFactory::GetInstance());