Remove cc dependency from ui/base

ui/android/window_android_compositor.h

Index: ui/android/window_android_compositor.h
diff --git a/ui/base/android/window_android_compositor.h b/ui/android/window_android_compositor.h
similarity index 76%
rename from ui/base/android/window_android_compositor.h
rename to ui/android/window_android_compositor.h
index 6f290b1bdf4e19b6d9e98d2dbe63fde7168a9a4a..edd743f15396a0ed0b0266e5dcf707eac98a5526 100644
--- a/ui/base/android/window_android_compositor.h
+++ b/ui/android/window_android_compositor.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_ANDROID_WINDOW_ANDROID_COMPOSITOR_H_
-#define UI_BASE_ANDROID_WINDOW_ANDROID_COMPOSITOR_H_
+#ifndef UI_ANDROID_WINDOW_ANDROID_COMPOSITOR_H_
+#define UI_ANDROID_WINDOW_ANDROID_COMPOSITOR_H_
 
 #include "cc/output/copy_output_request.h"
-#include "ui/base/ui_base_export.h"
+#include "ui/android/ui_android_export.h"
 
 namespace cc {
 class Layer;
@@ -17,7 +17,7 @@ namespace ui {
 class ResourceManager;
 
 // Android interface for compositor-related tasks.
-class UI_BASE_EXPORT WindowAndroidCompositor {
+class UI_ANDROID_EXPORT WindowAndroidCompositor {
  public:
   virtual ~WindowAndroidCompositor() {}
 
@@ -32,4 +32,4 @@ class UI_BASE_EXPORT WindowAndroidCompositor {
 
 }  // namespace ui
 
-#endif  // UI_BASE_ANDROID_WINDOW_ANDROID_COMPOSITOR_H_
+#endif  // UI_ANDROID_WINDOW_ANDROID_COMPOSITOR_H_