Changes code using Compositor to pass in ContextFactory

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d2322d8d42e89c7d6cc339c7b0ffa0649ac9474d..540f502aa57e8e3b37223c919b3066dd8a8fef88 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -168,6 +168,7 @@ class AshVisibilityController : public ::wm::VisibilityController {
 AshWindowTreeHostInitParams ShellInitParamsToAshWindowTreeHostInitParams(
     const ShellInitParams& shell_init_params) {
   AshWindowTreeHostInitParams ash_init_params;
+  ash_init_params.context_factory = shell_init_params.context_factory;
 #if defined(OS_WIN)
   ash_init_params.remote_hwnd = shell_init_params.remote_hwnd;
 #endif
@@ -187,7 +188,7 @@ bool Shell::initially_hide_cursor_ = false;
 // static
 Shell* Shell::CreateInstance(const ShellInitParams& init_params) {
   CHECK(!instance_);
-  instance_ = new Shell(init_params.delegate);
+  instance_ = new Shell(init_params.delegate, init_params.context_factory);
   instance_->Init(init_params);
   return instance_;
 }
@@ -617,7 +618,7 @@ void Shell::DoInitialWorkspaceAnimation() {
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
-Shell::Shell(ShellDelegate* delegate)
+Shell::Shell(ShellDelegate* delegate, ui::ContextFactory* context_factory)
     : target_root_window_(NULL),
       scoped_target_root_window_(NULL),
       delegate_(delegate),
@@ -635,7 +636,7 @@ Shell::Shell(ShellDelegate* delegate)
   DCHECK(delegate_.get());
   gpu_support_.reset(delegate_->CreateGPUSupport());
   display_manager_.reset(new DisplayManager);
-  display_controller_.reset(new DisplayController);
+  display_controller_.reset(new DisplayController(context_factory));
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   user_metrics_recorder_.reset(new UserMetricsRecorder);
 #endif  // defined(OS_CHROMEOS)