Refactor ViewsDelegate singleton

ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
index 9a626d69146268a7a82e69b0bd94cc5d579cd7cc..a9445f5721a155f6187901c9f03b9afa9643e356 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
@@ -16,6 +16,7 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/test/test_views.h"
+#include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
@@ -364,7 +365,7 @@ class DesktopAuraTopLevelWindowTest
 typedef WidgetTest DesktopAuraWidgetTest;
 
 TEST_F(DesktopAuraWidgetTest, FullscreenWindowDestroyedBeforeOwnerTest) {
-  ViewsDelegate::views_delegate = NULL;
+  set_views_delegate(nullptr);

[sadrul, 2015/06/08 03:27:43]

Maybe DesktopAuraWidgetTest could do this in its SetUp() override?

[mohsen, 2015/06/08 19:27:34]

The last two tests did not change the existing ViewsDelegate and I thought that
they might be dependent on it.

   DesktopAuraTopLevelWindowTest fullscreen_window;
   ASSERT_NO_FATAL_FAILURE(fullscreen_window.CreateTopLevelWindow(
       gfx::Rect(0, 0, 200, 200), true));
@@ -375,7 +376,7 @@ TEST_F(DesktopAuraWidgetTest, FullscreenWindowDestroyedBeforeOwnerTest) {
 }
 
 TEST_F(DesktopAuraWidgetTest, FullscreenWindowOwnerDestroyed) {
-  ViewsDelegate::views_delegate = NULL;
+  set_views_delegate(nullptr);
 
   DesktopAuraTopLevelWindowTest fullscreen_window;
   ASSERT_NO_FATAL_FAILURE(fullscreen_window.CreateTopLevelWindow(
@@ -387,7 +388,7 @@ TEST_F(DesktopAuraWidgetTest, FullscreenWindowOwnerDestroyed) {
 }
 
 TEST_F(DesktopAuraWidgetTest, TopLevelOwnedPopupTest) {
-  ViewsDelegate::views_delegate = NULL;
+  set_views_delegate(nullptr);
   DesktopAuraTopLevelWindowTest popup_window;
   ASSERT_NO_FATAL_FAILURE(popup_window.CreateTopLevelWindow(
       gfx::Rect(0, 0, 200, 200), false));
@@ -400,7 +401,7 @@ TEST_F(DesktopAuraWidgetTest, TopLevelOwnedPopupTest) {
 // This test validates that when a top level owned popup Aura window is
 // resized, the widget is resized as well.
 TEST_F(DesktopAuraWidgetTest, TopLevelOwnedPopupResizeTest) {
-  ViewsDelegate::views_delegate = NULL;
+  set_views_delegate(nullptr);
   DesktopAuraTopLevelWindowTest popup_window;
 
   popup_window.set_use_async_mode(false);
@@ -420,7 +421,7 @@ TEST_F(DesktopAuraWidgetTest, TopLevelOwnedPopupResizeTest) {
 // This test validates that when a top level owned popup Aura window is
 // repositioned, the widget is repositioned as well.
 TEST_F(DesktopAuraWidgetTest, TopLevelOwnedPopupRepositionTest) {
-  ViewsDelegate::views_delegate = NULL;
+  set_views_delegate(nullptr);
   DesktopAuraTopLevelWindowTest popup_window;
 
   popup_window.set_use_async_mode(false);