MacViews: tryjobs for toolkit_views=1

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc

Index: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index 44aee578bda0a14a855364e7aa17aaf6385583da..e613db352036cab16bb945a1588488d136d07bcf 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -15,6 +15,7 @@
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
@@ -35,7 +36,6 @@
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/wm/core/default_activation_client.h"
 #endif
 
@@ -43,7 +43,9 @@ using base::ASCIIToUTF16;
 
 class AccessibilityViewsDelegate : public views::TestViewsDelegate {
  public:
-  AccessibilityViewsDelegate() {}
+  explicit AccessibilityViewsDelegate(ui::ContextFactory* context_factory) {
+    set_context_factory(context_factory);
+  }
   ~AccessibilityViewsDelegate() override {}
 
   // Overridden from views::TestViewsDelegate:
@@ -108,13 +110,13 @@ class AccessibilityEventRouterViewsTest
 #if defined(OS_WIN)
     ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
-    views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
-#if defined(USE_AURA)
     // The ContextFactory must exist before any Compositors are created.
     bool enable_pixel_output = false;
     ui::ContextFactory* context_factory =
         ui::InitializeContextFactoryForTests(enable_pixel_output);
-
+    views::ViewsDelegate::views_delegate =
+        new AccessibilityViewsDelegate(context_factory);
+#if defined(USE_AURA)
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     aura_test_helper_->SetUp(context_factory);
     new wm::DefaultActivationClient(aura_test_helper_->root_window());
@@ -126,9 +128,9 @@ class AccessibilityEventRouterViewsTest
     ClearCallback();
 #if defined(USE_AURA)
     aura_test_helper_->TearDown();
-    ui::TerminateContextFactoryForTests();
 #endif
     delete views::ViewsDelegate::views_delegate;
+    ui::TerminateContextFactoryForTests();
 
     // The Widget's FocusManager is deleted using DeleteSoon - this
     // forces it to be deleted now, so we don't have any memory leaks