Use a mocked compositor for unit tests

views/widget/widget.h

 // Copyright (c) 2011 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 VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <stack>
 
@@ skipping 25 matching lines @@
 namespace gfx {
 class Canvas;
 class Path;
 class Point;
 class Rect;
 }
 
 namespace ui {
 class Accelerator;
 class Compositor;
+class CompositorDelegate;
 class OSExchangeData;
 class ThemeProvider;
 enum TouchStatus;
 }
 using ui::ThemeProvider;
 
 namespace views {
 
 class DefaultThemeProvider;
 class InputMethod;
@@ skipping 433 matching lines @@
 
   ClientView* client_view() {
     return const_cast<ClientView*>(
         const_cast<const Widget*>(this)->client_view());
   }
   const ClientView* client_view() const {
     // non_client_view_ may be NULL, especially during creation.
     return non_client_view_ ? non_client_view_->client_view() : NULL;
   }
 
-  static void set_compositor_factory_for_testing(ui::Compositor*(*factory)()) {
+  static void set_compositor_factory_for_testing(
+      ui::Compositor*(*factory)(ui::CompositorDelegate* owner)) {
     compositor_factory_ = factory;
   }
-  static ui::Compositor* (*compositor_factory())() {
+  static ui::Compositor* (*compositor_factory())(
+      ui::CompositorDelegate* owner) {
     return compositor_factory_;
   }
 
   const ui::Compositor* GetCompositor() const;
   ui::Compositor* GetCompositor();
 
   // Invokes method of same name on the NativeWidget.
   void CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
                                           ui::Layer** layer_parent);
 
@@ skipping 203 matching lines @@
   // when the widget is shown. Set this value to false to override
   // initial focus for the widget.
   bool focus_on_creation_;
 
   scoped_ptr<InputMethod> input_method_;
 
   // See |is_top_level()| accessor.
   bool is_top_level_;
 
   // Factory used to create Compositors. Settable by tests.
-  static ui::Compositor*(*compositor_factory_)();
+  // The delegate can be NULL if you don't wish to catch the ScheduleDraw()
+  // calls to it.
+  static ui::Compositor*(*compositor_factory_)(
+      ui::CompositorDelegate* delegate);
 
   // Tracks whether native widget has been initialized.
   bool native_widget_initialized_;
 
   // TODO(beng): Remove NativeWidgetGtk's dependence on these:
   // If true, the mouse is currently down.
   bool is_mouse_button_pressed_;
 
   // TODO(beng): Remove NativeWidgetGtk's dependence on these:
   // The following are used to detect duplicate mouse move events and not
   // deliver them. Displaying a window may result in the system generating
   // duplicate move events even though the mouse hasn't moved.
   bool last_mouse_event_was_move_;
   gfx::Point last_mouse_event_position_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_