Revert 221197 "Adds an integration test for uninstalling app lis..."

trunk/src/ash/wm/app_list_controller.h

 // 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.
 
 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_
 #define ASH_WM_APP_LIST_CONTROLLER_H_
 
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
@@ skipping 11 matching lines @@
 class ApplicationDragAndDropHost;
 class AppListView;
 class PaginationModel;
 }
 
 namespace ui {
 class LocatedEvent;
 }
 
 namespace ash {
-namespace test {
-class AppListControllerTestApi;
-}
-
 namespace internal {
 
 // AppListController is a controller that manages app list UI for shell.
 // It creates AppListView and schedules showing/hiding animation.
 // While the UI is visible, it monitors things such as app list widget's
 // activation state and desktop mouse click to auto dismiss the UI.
 class AppListController : public ui::EventHandler,
                           public aura::client::FocusChangeObserver,
                           public aura::WindowObserver,
                           public ui::ImplicitAnimationObserver,
@@ skipping 14 matching lines @@
   bool IsVisible() const;
 
   // Returns target visibility. This differs from IsVisible() if an animation
   // is ongoing.
   bool GetTargetVisibility() const { return is_visible_; }
 
   // Returns app list window or NULL if it is not visible.
   aura::Window* GetWindow();
 
  private:
-  friend class test::AppListControllerTestApi;
-
   // If |drag_and_drop_host| is not NULL it will be called upon drag and drop
   // operations outside the application list.
   void SetDragAndDropHostOfCurrentAppList(
       app_list::ApplicationDragAndDropHost* drag_and_drop_host);
 
   // Sets the app list view and attempts to show it.
   void SetView(app_list::AppListView* view);
 
   // Forgets the view.
   void ResetView();
@@ skipping 51 matching lines @@
   // Whether should schedule snap back animation.
   bool should_snap_back_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_APP_LIST_CONTROLLER_H_