Introduce a layering in the invalidation component as public and impl

components/invalidation/non_blocking_invalidator.h

Index: components/invalidation/non_blocking_invalidator.h
diff --git a/components/invalidation/non_blocking_invalidator.h b/components/invalidation/non_blocking_invalidator.h
deleted file mode 100644
index 73db2802c1179652af5cc16fb1e5c622e6249d97..0000000000000000000000000000000000000000
--- a/components/invalidation/non_blocking_invalidator.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2014 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.
-//
-// An implementation of SyncNotifier that wraps InvalidationNotifier
-// on its own thread.
-
-#ifndef COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
-#define COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/callback.h"
-#include "base/compiler_specific.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
-#include "components/invalidation/invalidation_export.h"
-#include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator.h"
-#include "components/invalidation/invalidator_registrar.h"
-#include "components/invalidation/invalidator_state.h"
-#include "components/invalidation/unacked_invalidation_set.h"
-#include "jingle/notifier/base/notifier_options.h"
-
-namespace base {
-class SingleThreadTaskRunner;
-}  // namespace base
-
-namespace syncer {
-class SyncNetworkChannel;
-class GCMNetworkChannelDelegate;
-
-// Callback type for function that creates SyncNetworkChannel. This function
-// gets passed into NonBlockingInvalidator constructor.
-typedef base::Callback<scoped_ptr<SyncNetworkChannel>(void)>
-    NetworkChannelCreator;
-
-class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
-    : public Invalidator,
-      public InvalidationStateTracker {
- public:
-  // |invalidation_state_tracker| must be initialized and must outlive |this|.
-  NonBlockingInvalidator(
-      NetworkChannelCreator network_channel_creator,
-      const std::string& invalidator_client_id,
-      const UnackedInvalidationsMap& saved_invalidations,
-      const std::string& invalidation_bootstrap_data,
-      InvalidationStateTracker* invalidation_state_tracker,
-      const std::string& client_info,
-      const scoped_refptr<net::URLRequestContextGetter>&
-          request_context_getter);
-
-  ~NonBlockingInvalidator() override;
-
-  // Invalidator implementation.
-  void RegisterHandler(InvalidationHandler* handler) override;
-  bool UpdateRegisteredIds(InvalidationHandler* handler,
-                           const ObjectIdSet& ids) override;
-  void UnregisterHandler(InvalidationHandler* handler) override;
-  InvalidatorState GetInvalidatorState() const override;
-  void UpdateCredentials(const std::string& email,
-                         const std::string& token) override;
-  void RequestDetailedStatus(base::Callback<void(const base::DictionaryValue&)>
-                                 callback) const override;
-
-  // Static functions to construct callback that creates network channel for
-  // SyncSystemResources. The goal is to pass network channel to invalidator at
-  // the same time not exposing channel specific parameters to invalidator and
-  // channel implementation to client of invalidator.
-  static NetworkChannelCreator MakePushClientChannelCreator(
-      const notifier::NotifierOptions& notifier_options);
-  static NetworkChannelCreator MakeGCMNetworkChannelCreator(
-      scoped_refptr<net::URLRequestContextGetter> request_context_getter,
-      scoped_ptr<GCMNetworkChannelDelegate> delegate);
-
-  // These methods are forwarded to the invalidation_state_tracker_.
-  void ClearAndSetNewClientId(const std::string& data) override;
-  std::string GetInvalidatorClientId() const override;
-  void SetBootstrapData(const std::string& data) override;
-  std::string GetBootstrapData() const override;
-  void SetSavedInvalidations(const UnackedInvalidationsMap& states) override;
-  UnackedInvalidationsMap GetSavedInvalidations() const override;
-  void Clear() override;
-
- private:
-  void OnInvalidatorStateChange(InvalidatorState state);
-  void OnIncomingInvalidation(const ObjectIdInvalidationMap& invalidation_map);
-  std::string GetOwnerName() const;
-
-  friend class NonBlockingInvalidatorTestDelegate;
-
-  struct InitializeOptions;
-  class Core;
-
-  InvalidatorRegistrar registrar_;
-  InvalidationStateTracker* invalidation_state_tracker_;
-
-  // The real guts of NonBlockingInvalidator, which allows this class to live
-  // completely on the parent thread.
-  scoped_refptr<Core> core_;
-  scoped_refptr<base::SingleThreadTaskRunner> parent_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
-
-  base::WeakPtrFactory<NonBlockingInvalidator> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(NonBlockingInvalidator);
-};
-
-}  // namespace syncer
-
-#endif  // COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_