Make use of InvalidationService

sync/notifier/invalidator_factory.h

Index: sync/notifier/invalidator_factory.h
diff --git a/sync/notifier/invalidator_factory.h b/sync/notifier/invalidator_factory.h
deleted file mode 100644
index 782850eb4913cce31dfb83c87892658e56d7d50b..0000000000000000000000000000000000000000
--- a/sync/notifier/invalidator_factory.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SYNC_NOTIFIER_INVALIDATOR_FACTORY_H_
-#define SYNC_NOTIFIER_INVALIDATOR_FACTORY_H_
-
-#include <string>
-
-#include "base/memory/weak_ptr.h"
-#include "jingle/notifier/base/notifier_options.h"
-#include "sync/base/sync_export.h"
-#include "sync/internal_api/public/util/weak_handle.h"
-#include "sync/notifier/invalidation_state_tracker.h"
-
-namespace syncer {
-
-class Invalidator;
-
-// Class to instantiate various implementations of the Invalidator
-// interface.
-class SYNC_EXPORT InvalidatorFactory {
- public:
-  // |client_info| is a string identifying the client, e.g. a user
-  // agent string.  |invalidation_state_tracker| may be NULL (for
-  // tests).
-  InvalidatorFactory(
-      const notifier::NotifierOptions& notifier_options,
-      const std::string& client_info,
-      const base::WeakPtr<InvalidationStateTracker>&
-          invalidation_state_tracker);
-  ~InvalidatorFactory();
-
-  // Creates an invalidator. Caller takes ownership of the returned
-  // object.  However, the returned object must not outlive the
-  // factory from which it was created.  Can be called on any thread.
-  Invalidator* CreateInvalidator();
-
-  // Returns the unique ID that was (or will be) passed to the invalidator.
-  std::string GetInvalidatorClientId() const;
-
- private:
-  const notifier::NotifierOptions notifier_options_;
-
-  // Some of these should be const, but can't be set up in member initializers.
-  InvalidationStateMap initial_invalidation_state_map_;
-  const std::string client_info_;
-  std::string invalidator_client_id_;
-  std::string invalidation_bootstrap_data_;
-  WeakHandle<InvalidationStateTracker> invalidation_state_tracker_;
-};
-
-}  // namespace syncer
-
-#endif  // SYNC_NOTIFIER_INVALIDATOR_FACTORY_H_