Introduce a layering in the invalidation component as public and impl

components/invalidation/impl/invalidation_service_android.h

 // 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 COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
-#define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
+#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
+#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.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/invalidation/impl/invalidation_logger.h"
+#include "components/invalidation/impl/invalidator_registrar.h"
+#include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace invalidation {
 
 class InvalidationLogger;
 
 // This InvalidationService is used to deliver invalidations on Android.  The
 // Android operating system has its own mechanisms for delivering invalidations.
 class InvalidationServiceAndroid
     : public base::NonThreadSafe,
@@ skipping 55 matching lines @@
 
   // The invalidation logger object we use to record state changes
   // and invalidations.
   InvalidationLogger logger_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationServiceAndroid);
 };
 
 }  // namespace invalidation
 
-#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
+#endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_