Changes code using Compositor to pass in ContextFactory

chrome/test/base/view_event_test_base.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 "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 26 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #else  // !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
 
 namespace {
 
+class ViewEventTestBaseViewsDelegate : public ChromeViewsDelegate {
+ public:
+  ViewEventTestBaseViewsDelegate() : context_factory_(NULL) {
+    views::ViewsDelegate::views_delegate = this;
+  }
+  virtual ~ViewEventTestBaseViewsDelegate() {
+    views::ViewsDelegate::views_delegate = NULL;
+  }
+
+  void set_context_factory(ui::ContextFactory* context_factory) {
+    context_factory_ = context_factory;
+  }
+
+  // ChromeViewsDelegate:
+  virtual ui::ContextFactory* GetContextFactory() OVERRIDE {
+    return context_factory_;
+  }
+
+ private:
+  ui::ContextFactory* context_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(ViewEventTestBaseViewsDelegate);
+};
+
 // View subclass that allows you to specify the preferred size.
 class TestView : public views::View {
  public:
   TestView() {}
 
   void SetPreferredSize(const gfx::Size& size) {
     preferred_size_ = size;
     PreferredSizeChanged();
   }
 
@@ skipping 39 matching lines @@
 }
 
 void ViewEventTestBase::SetUpTestCase() {
   ChromeUnitTestSuite::InitializeProviders();
   ChromeUnitTestSuite::InitializeResourceBundle();
 }
 
 void ViewEventTestBase::SetUp() {
   wm_state_.reset(new wm::WMState);
 
-  views::ViewsDelegate::views_delegate = &views_delegate_;
+  ViewEventTestBaseViewsDelegate* views_delegate =
+      new ViewEventTestBaseViewsDelegate;
+  views_delegate_.reset(views_delegate);
+
   ui::InitializeInputMethodForTesting();
   gfx::NativeView context = NULL;
 
   // 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);
+  views_delegate->set_context_factory(context_factory);
 
 #if defined(USE_ASH)
 #if defined(OS_WIN)
   // http://crbug.com/154081 use ash::Shell code path below on win_ash bots when
   // interactive_ui_tests is brought up on that platform.
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 
 #else  // !OS_WIN
   // Ash Shell can't just live on its own without a browser process, we need to
   // also create the message center.
   message_center::MessageCenter::Initialize();
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::InitializeWithStub();
   chromeos::CrasAudioHandler::InitializeForTesting();
   chromeos::NetworkHandler::Initialize();
 #endif  // OS_CHROMEOS
   ash::test::TestShellDelegate* shell_delegate =
       new ash::test::TestShellDelegate();
   ash::ShellInitParams init_params;
   init_params.delegate = shell_delegate;
+  init_params.context_factory = context_factory;
   ash::Shell::CreateInstance(init_params);
   shell_delegate->test_session_state_delegate()
       ->SetActiveUserSessionStarted(true);
   context = ash::Shell::GetPrimaryRootWindow();
   context->GetHost()->Show();
 #endif  // !OS_WIN
   aura::Env::CreateInstance(true);
 #elif defined(USE_AURA)
   // Instead of using the ash shell, use an AuraTestHelper to create and manage
   // the test screen.
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
-  aura_test_helper_->SetUp();
+  aura_test_helper_->SetUp(context_factory);
   new wm::DefaultActivationClient(aura_test_helper_->root_window());
   context = aura_test_helper_->root_window();
 #endif  // !USE_ASH && USE_AURA
 
   window_ = views::Widget::CreateWindowWithContext(this, context);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
     window_->Close();
@@ skipping 16 matching lines @@
   message_center::MessageCenter::Shutdown();
 #endif  // !OS_WIN
   aura::Env::DeleteInstance();
 #elif defined(USE_AURA)
   aura_test_helper_->TearDown();
 #endif  // !USE_ASH && USE_AURA
 
   ui::TerminateContextFactoryForTests();
 
   ui::ShutdownInputMethodForTesting();
-  views::ViewsDelegate::views_delegate = NULL;
+
+  views_delegate_.reset();
 
   wm_state_.reset();
 }
 
 bool ViewEventTestBase::CanResize() const {
   return true;
 }
 
 views::View* ViewEventTestBase::GetContentsView() {
   if (!content_view_) {
@@ skipping 53 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }