Makes tests either use mock compositor or mock WebGraphicsContext3D

ui/aura/desktop.cc

 // Copyright (c) 2011 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 "ui/aura/desktop.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 397 matching lines @@
       capture_window_(NULL),
       mouse_pressed_handler_(NULL),
       mouse_moved_handler_(NULL),
       focused_window_(NULL),
       touch_event_handler_(NULL) {
   SetName("RootWindow");
   gfx::Screen::SetInstance(screen_);
   host_->SetDesktop(this);
   last_mouse_location_ = host_->QueryMouseLocation();
 
-  if (ui::Compositor::compositor_factory()) {
-    compositor_ = (*ui::Compositor::compositor_factory())(this);
-  } else {
 #ifdef USE_WEBKIT_COMPOSITOR
-    ui::CompositorCC::Initialize(false);
+  ui::CompositorCC::Initialize(false);
 #endif
-    compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
-                                         host_->GetSize());
-  }
+  compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
+                                       host_->GetSize());
   DCHECK(compositor_.get());
 }
 
 Desktop::~Desktop() {
   in_destructor_ = true;
+  // Make sure to NULL out the compositor before terminating so that state is
+  // cleared and we don't hit asserts.
+  compositor_ = NULL;
 #ifdef USE_WEBKIT_COMPOSITOR
-  if (!ui::Compositor::compositor_factory())
-    ui::CompositorCC::Terminate();
+  ui::CompositorCC::Terminate();
 #endif
   if (instance_ == this)
     instance_ = NULL;
 }
 
 void Desktop::HandleMouseMoved(const MouseEvent& event, Window* target) {
   if (target == mouse_moved_handler_)
     return;
 
   // Send an exited event.
@@ skipping 154 matching lines @@
       base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
     bounds.set_size(gfx::Size(parsed_width, parsed_height));
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(DesktopHost::GetNativeScreenSize());
   }
 
   return bounds;
 }
 
 }  // namespace aura