Makes Env contain a ContextFactory

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 34 matching lines @@
   AccessibilityViewsDelegate() {}
   virtual ~AccessibilityViewsDelegate() {}
 
   // Overridden from views::TestViewsDelegate:
   virtual void NotifyAccessibilityEvent(
       views::View* view, ui::AXEvent event_type) OVERRIDE {
     AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
         view, event_type);
   }
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(AccessibilityViewsDelegate);
 };
 
 class AccessibilityWindowDelegate : public views::WidgetDelegate {
  public:
   explicit AccessibilityWindowDelegate(views::View* contents)
       : contents_(contents) { }
 
   // Overridden from views::WidgetDelegate:
   virtual void DeleteDelegate() OVERRIDE { delete this; }
@@ skipping 38 matching lines @@
   }
 
   virtual void SetUp() {
 #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::InitializeContextFactoryForTests(enable_pixel_output);
+    ui::ContextFactory* context_factory =
+        ui::InitializeContextFactoryForTests(enable_pixel_output);
 
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
-    aura_test_helper_->SetUp();
+    aura_test_helper_->SetUp(context_factory);
     new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif  // USE_AURA
     EnableAccessibilityAndListenToFocusNotifications();
   }
 
   virtual void TearDown() {
     ClearCallback();
 #if defined(USE_AURA)
     aura_test_helper_->TearDown();
     ui::TerminateContextFactoryForTests();
 #endif
     delete views::ViewsDelegate::views_delegate;
-    views::ViewsDelegate::views_delegate = NULL;
 
     // The Widget's FocusManager is deleted using DeleteSoon - this
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
     base::MessageLoop::current()->RunUntilIdle();
 
 #if defined(OS_WIN)
     ole_initializer_.reset();
 #endif
   }
@@ skipping 361 matching lines @@
 
     AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
         menu_container,
         menu->GetMenuItemByID(kTestCases[i].command_id),
         &index,
         &count);
     EXPECT_EQ(kTestCases[i].expected_index, index) << "Case " << i;
     EXPECT_EQ(kTestCases[i].expected_count, count) << "Case " << i;
   }
 }