Introduce a layering in the invalidation component as public and impl

components/invalidation/sync_invalidation_listener.h

 // 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.
 //
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
 #ifndef COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
 #define COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/invalidation/ack_handler.h"
-#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/base/ack_handler.h"
+#include "components/invalidation/base/invalidation_export.h"
+#include "components/invalidation/base/invalidator_state.h"
 #include "components/invalidation/invalidation_state_tracker.h"
-#include "components/invalidation/invalidator_state.h"
 #include "components/invalidation/state_writer.h"
 #include "components/invalidation/sync_system_resources.h"
 #include "components/invalidation/unacked_invalidation_set.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
 namespace notifier {
@@ skipping 150 matching lines @@
   InvalidatorState push_client_state_;
 
   base::WeakPtrFactory<SyncInvalidationListener> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncInvalidationListener);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_