ui: Move compositor/ directory out of gfx/, up to ui/.

ash/launcher/launcher_view_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "ash/launcher/launcher_view.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
+#include "ash/launcher/launcher_icon_observer.h"
 #include "ash/launcher/launcher_model.h"
-#include "ash/launcher/launcher_icon_observer.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
-#include "ui/aura/test/aura_test_base.h"
-#include "ui/gfx/compositor/layer.h"
+#include "ui/compositor/layer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
 // LauncherIconObserver tests.
 
 class TestLauncherIconObserver : public LauncherIconObserver {
@@ skipping 252 matching lines @@
   // Verifies non-overflow buttons are visible.
   for (int i = 0; i <= test_api_->GetLastVisibleIndex(); ++i) {
     internal::LauncherButton* button = test_api_->GetButton(i);
     EXPECT_TRUE(button->visible()) << "button index=" << i;
     EXPECT_EQ(1.0f, button->layer()->opacity()) << "button index=" << i;
   }
 }
 
 }  // namespace test
 }  // namespace ash