Changes code using Compositor to pass in ContextFactory

content/shell/browser/shell_views.cc

Index: content/shell/browser/shell_views.cc
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index fda7fbcd46b87e4d63c72c3f19b5067651f889ea..8922e5f7628978a3f03ce226b0e510558a8bf4af 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/browser/context_factory.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
@@ -424,12 +425,15 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   chromeos::DBusThreadManager::Initialize();
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
-  wm_test_helper_ = new wm::WMTestHelper(default_window_size);
+  wm_test_helper_ = new wm::WMTestHelper(default_window_size,
+                                         GetContextFactory());
 #else
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 #endif
-  views_delegate_ = new ShellViewsDelegateAura();
+  ShellViewsDelegateAura* views_delegate = new ShellViewsDelegateAura();
+  views_delegate_ = views_delegate;
+  views_delegate->set_context_factory(GetContextFactory());
 }
 
 void Shell::PlatformExit() {