Revert of Make ui::Compositor use ui::Scheduler

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 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/compositor/test/in_process_context_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 45 matching lines @@
   }
 
  private:
   base::WeakPtrFactory<DirectOutputSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectOutputSurface);
 };
 
 }  // namespace
 
-InProcessContextFactory::InProcessContextFactory(bool context_factory_for_test)
-    : next_surface_id_namespace_(1u),
-      use_test_surface_(true),
-      context_factory_for_test_(context_factory_for_test) {
+InProcessContextFactory::InProcessContextFactory()
+    : next_surface_id_namespace_(1u), use_test_surface_(true) {
   DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone)
       << "If running tests, ensure that main() is calling "
       << "gfx::GLSurface::InitializeOneOffForTests()";
 
 #if defined(OS_CHROMEOS)
   bool use_thread = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUIDisableThreadedCompositing);
 #else
   bool use_thread = false;
 #endif
@@ skipping 57 matching lines @@
           lose_context_when_out_of_memory);
   if (shared_main_thread_contexts_.get() &&
       !shared_main_thread_contexts_->BindToCurrentThread())
     shared_main_thread_contexts_ = NULL;
 
   return shared_main_thread_contexts_;
 }
 
 void InProcessContextFactory::RemoveCompositor(Compositor* compositor) {}
 
-bool InProcessContextFactory::DoesCreateTestContexts() {
-  return context_factory_for_test_;
-}
+bool InProcessContextFactory::DoesCreateTestContexts() { return false; }
 
 cc::SharedBitmapManager* InProcessContextFactory::GetSharedBitmapManager() {
   return &shared_bitmap_manager_;
 }
 
 gpu::GpuMemoryBufferManager*
 InProcessContextFactory::GetGpuMemoryBufferManager() {
   return &gpu_memory_buffer_manager_;
 }
 
 base::MessageLoopProxy* InProcessContextFactory::GetCompositorMessageLoop() {
   if (!compositor_thread_)
     return NULL;
   return compositor_thread_->message_loop_proxy().get();
 }
 
 scoped_ptr<cc::SurfaceIdAllocator>
 InProcessContextFactory::CreateSurfaceIdAllocator() {
   return make_scoped_ptr(
       new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
 }
 
 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                             const gfx::Size& size) {
 }
 
 }  // namespace ui