Restructure contents of blimp/client.

blimp/client/app/android/blimp_compositor_android.h

 // Copyright 2015 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 BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_ANDROID_H_
-#define BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_ANDROID_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_COMPOSITOR_ANDROID_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_COMPOSITOR_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "blimp/client/compositor/blimp_compositor.h"
+#include "blimp/client/feature/compositor/blimp_compositor.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class Thread;
 }
 
 namespace cc {
 class LayerTreeHost;
@@ skipping 44 matching lines @@
   // True if the |portrait_width_| and |landscape_width_| represent the device's
   // physical dimensions, including any area occupied by system decorations.
   bool real_size_supported_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositorAndroid);
 };
 
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_ANDROID_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_COMPOSITOR_ANDROID_H_