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

ui/app_list/views/app_list_view.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 "ui/app_list/views/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 32 matching lines @@
 #endif
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
 #endif  // defined(USE_AURA)
 
 namespace app_list {
 
 namespace {
 
-// For UMA and testing. If non-null, triggered when the app list is painted.
-base::Closure g_next_paint_callback;
+void (*g_next_paint_callback)();
 
 // The margin from the edge to the speech UI.
 const int kSpeechUIMargin = 12;
 
 // The vertical position for the appearing animation of the speech UI.
 const float kSpeechUIAppearingPosition = 12;
 
 // The distance between the arrow tip and edge of the anchor view.
 const int kArrowOffset = 10;
 
@@ skipping 128 matching lines @@
 void AppListView::UpdateBounds() {
   SizeToContents();
 }
 
 gfx::Size AppListView::GetPreferredSize() {
   return app_list_main_view_->GetPreferredSize();
 }
 
 void AppListView::Paint(gfx::Canvas* canvas) {
   views::BubbleDelegateView::Paint(canvas);
-  if (!g_next_paint_callback.is_null()) {
-    g_next_paint_callback.Run();
-    g_next_paint_callback.Reset();
+  if (g_next_paint_callback) {
+    g_next_paint_callback();
+    g_next_paint_callback = NULL;
   }
 }
 
 void AppListView::OnThemeChanged() {
 #if defined(OS_WIN)
   GetWidget()->Close();
 #endif
 }
 
 bool AppListView::ShouldHandleSystemCommands() const {
@@ skipping 21 matching lines @@
 
 void AppListView::AddObserver(AppListViewObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppListView::RemoveObserver(AppListViewObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 // static
-void AppListView::SetNextPaintCallback(const base::Closure& callback) {
+void AppListView::SetNextPaintCallback(void (*callback)()) {
   g_next_paint_callback = callback;
 }
 
 #if defined(OS_WIN)
 HWND AppListView::GetHWND() const {
 #if defined(USE_AURA)
   gfx::NativeWindow window =
       GetWidget()->GetTopLevelWidget()->GetNativeWindow();
   return window->GetHost()->GetAcceleratedWidget();
 #else
@@ skipping 244 matching lines @@
 #else
   speech_view_->SetVisible(recognizing);
   app_list_main_view_->SetVisible(!recognizing);
 
   // Needs to schedule paint of AppListView itself, to repaint the background.
   GetBubbleFrameView()->SchedulePaint();
 #endif
 }
 
 }  // namespace app_list