Introduce a layering in the invalidation component as public and impl

components/invalidation/gcm_invalidation_bridge.h

Index: components/invalidation/gcm_invalidation_bridge.h
diff --git a/components/invalidation/gcm_invalidation_bridge.h b/components/invalidation/gcm_invalidation_bridge.h
deleted file mode 100644
index 9f9fe42696996f062922e086176c2cb9bf1b55b6..0000000000000000000000000000000000000000
--- a/components/invalidation/gcm_invalidation_bridge.h
+++ /dev/null
@@ -1,113 +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.
-
-#ifndef COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
-#define COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
-
-#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "base/threading/non_thread_safe.h"
-#include "components/gcm_driver/gcm_app_handler.h"
-#include "components/gcm_driver/gcm_client.h"
-#include "components/gcm_driver/gcm_connection_observer.h"
-#include "components/invalidation/gcm_network_channel_delegate.h"
-#include "google_apis/gaia/oauth2_token_service.h"
-
-class IdentityProvider;
-
-namespace base {
-class SingleThreadTaskRunner;
-}  // namespace base
-
-namespace gcm {
-class GCMDriver;
-}  // namespace gcm
-
-namespace invalidation {
-
-// GCMInvalidationBridge and GCMInvalidationBridge::Core implement functions
-// needed for GCMNetworkChannel. GCMInvalidationBridge lives on UI thread while
-// Core lives on IO thread. Core implements GCMNetworkChannelDelegate and posts
-// all function calls to GCMInvalidationBridge which does actual work to perform
-// them.
-class GCMInvalidationBridge : public gcm::GCMAppHandler,
-                              public gcm::GCMConnectionObserver,
-                              public OAuth2TokenService::Consumer,
-                              public base::NonThreadSafe {
- public:
-  class Core;
-
-  GCMInvalidationBridge(gcm::GCMDriver* gcm_driver,
-                        IdentityProvider* identity_provider);
-  ~GCMInvalidationBridge() override;
-
-  // OAuth2TokenService::Consumer implementation.
-  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                         const std::string& access_token,
-                         const base::Time& expiration_time) override;
-  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                         const GoogleServiceAuthError& error) override;
-
-  // gcm::GCMAppHandler implementation.
-  void ShutdownHandler() override;
-  void OnMessage(const std::string& app_id,
-                 const gcm::GCMClient::IncomingMessage& message) override;
-  void OnMessagesDeleted(const std::string& app_id) override;
-  void OnSendError(
-      const std::string& app_id,
-      const gcm::GCMClient::SendErrorDetails& send_error_details) override;
-  void OnSendAcknowledged(const std::string& app_id,
-                          const std::string& message_id) override;
-
-  // gcm::GCMConnectionObserver implementation.
-  void OnConnected(const net::IPEndPoint& ip_endpoint) override;
-  void OnDisconnected() override;
-
-  scoped_ptr<syncer::GCMNetworkChannelDelegate> CreateDelegate();
-
-  void CoreInitializationDone(
-      base::WeakPtr<Core> core,
-      scoped_refptr<base::SingleThreadTaskRunner> core_thread_task_runner);
-
-  // Functions reflecting GCMNetworkChannelDelegate interface. These are called
-  // on UI thread to perform actual work.
-  void RequestToken(
-      syncer::GCMNetworkChannelDelegate::RequestTokenCallback callback);
-  void InvalidateToken(const std::string& token);
-
-  void Register(syncer::GCMNetworkChannelDelegate::RegisterCallback callback);
-
-  void SubscribeForIncomingMessages();
-
-  void RegisterFinished(
-      syncer::GCMNetworkChannelDelegate::RegisterCallback callback,
-      const std::string& registration_id,
-      gcm::GCMClient::Result result);
-
-  void Unregister();
-
-  static void UnregisterFinishedNoOp(gcm::GCMClient::Result result);
-
- private:
-  gcm::GCMDriver* const gcm_driver_;
-  IdentityProvider* const identity_provider_;
-
-  base::WeakPtr<Core> core_;
-  scoped_refptr<base::SingleThreadTaskRunner> core_thread_task_runner_;
-
-  // Fields related to RequestToken function.
-  scoped_ptr<OAuth2TokenService::Request> access_token_request_;
-  syncer::GCMNetworkChannelDelegate::RequestTokenCallback
-      request_token_callback_;
-  bool subscribed_for_incoming_messages_;
-
-  base::WeakPtrFactory<GCMInvalidationBridge> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(GCMInvalidationBridge);
-};
-
-}  // namespace invalidation
-
-#endif  // COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_