Massive refactor of the Android invalidation code.

chrome/browser/invalidation/invalidation_service_android.h

Index: chrome/browser/invalidation/invalidation_service_android.h
diff --git a/chrome/browser/invalidation/invalidation_service_android.h b/chrome/browser/invalidation/invalidation_service_android.h
deleted file mode 100644
index 63af3fc3d0c3da60350409ac9b8c8cd9a9dbaf94..0000000000000000000000000000000000000000
--- a/chrome/browser/invalidation/invalidation_service_android.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) 2013 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 CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
-#define CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/threading/non_thread_safe.h"
-#include "components/invalidation/invalidation_logger.h"
-#include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/keyed_service/core/keyed_service.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-
-class Profile;
-
-namespace invalidation {
-class InvalidationControllerAndroid;
-class InvalidationLogger;
-
-// This InvalidationService is used to deliver invalidations on Android.  The
-// Android operating system has its own mechanisms for delivering invalidations.
-// This class uses the NotificationService to communicate with a thin wrapper
-// around Android's invalidations service.
-class InvalidationServiceAndroid
-    : public base::NonThreadSafe,
-      public InvalidationService,
-      public content::NotificationObserver {
- public:
-  // Takes ownership of |invalidation_controller|.
-  InvalidationServiceAndroid(
-      Profile* profile,
-      InvalidationControllerAndroid* invalidation_controller);
-  virtual ~InvalidationServiceAndroid();
-
-  // InvalidationService implementation.
-  //
-  // Note that this implementation does not properly support Ack-tracking,
-  // fetching the invalidator state, or querying the client's ID.  Support for
-  // exposing the client ID should be available soon; see crbug.com/172391.
-  virtual void RegisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
-  virtual void UpdateRegisteredInvalidationIds(
-      syncer::InvalidationHandler* handler,
-      const syncer::ObjectIdSet& ids) OVERRIDE;
-  virtual void UnregisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
-  virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
-  virtual std::string GetInvalidatorClientId() const OVERRIDE;
-  virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
-  virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) const
-      OVERRIDE;
-  virtual IdentityProvider* GetIdentityProvider() OVERRIDE;
-
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
-  // The InvalidationServiceAndroid always reports that it is enabled.
-  // This is used only by unit tests.
-  void TriggerStateChangeForTest(syncer::InvalidatorState state);
-
- private:
-  syncer::InvalidatorRegistrar invalidator_registrar_;
-  content::NotificationRegistrar registrar_;
-  syncer::InvalidatorState invalidator_state_;
-  scoped_ptr<InvalidationControllerAndroid> invalidation_controller_;
-
-  // The invalidation logger object we use to record state changes
-  // and invalidations.
-  InvalidationLogger logger_;
-
-  DISALLOW_COPY_AND_ASSIGN(InvalidationServiceAndroid);
-};
-
-}  // namespace invalidation
-
-#endif  // CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_