ash: Minor cleanup, move more files from launcher to shelf.

ash/test/launcher_view_test_api.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/test/launcher_view_test_api.h"
 
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
-#include "ash/launcher/overflow_button.h"
+#include "ash/shelf/overflow_button.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/view_model.h"
 
 namespace {
 
 // A class used to wait for animations.
 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
  public:
   TestAPIAnimationObserver() {}
@@ skipping 74 matching lines @@
   launcher_view_->bounds_animator_->RemoveObserver(observer.get());
 }
 
 bool LauncherViewTestAPI::SameDragType(LauncherItemType typea,
                                        LauncherItemType typeb) const {
   return launcher_view_->SameDragType(typea, typeb);
 }
 
 }  // namespace test
 }  // namespace ash