Revert of Add a whole-app-list unit test.

ui/app_list/views/app_list_view.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 UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
 
-#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/app_list/app_list_export.h"
 #include "ui/app_list/app_list_view_delegate_observer.h"
 #include "ui/app_list/speech_ui_model_observer.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace base {
 class FilePath;
@@ skipping 73 matching lines @@
   virtual void OnProfilesChanged() OVERRIDE;
 
   void Prerender();
 
   void SetProfileByPath(const base::FilePath& profile_path);
 
   void AddObserver(AppListViewObserver* observer);
   void RemoveObserver(AppListViewObserver* observer);
 
   // Set a callback to be called the next time any app list paints.
-  void SetNextPaintCallback(const base::Closure& callback);
+  static void SetNextPaintCallback(void (*callback)());
 
 #if defined(OS_WIN)
   HWND GetHWND() const;
 #endif
 
   AppListMainView* app_list_main_view() { return app_list_main_view_; }
 
  private:
   void InitAsBubbleInternal(gfx::NativeView parent,
                             PaginationModel* pagination_model,
@@ skipping 32 matching lines @@
 
   scoped_ptr<AppListViewDelegate> delegate_;
 
   AppListMainView* app_list_main_view_;
   SigninView* signin_view_;
   SpeechView* speech_view_;
 
   ObserverList<AppListViewObserver> observers_;
   scoped_ptr<HideViewAnimationObserver> animation_observer_;
 
-  // For UMA and testing. If non-null, triggered when the app list is painted.
-  base::Closure next_paint_callback_;
-
   DISALLOW_COPY_AND_ASSIGN(AppListView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_