Removes ContextFactory::Get/SetInstance

ui/compositor/compositor.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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "ui/compositor/layer.h"
 #include "ui/gfx/frame_time.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_switches.h"
 
 namespace {
 
 const double kDefaultRefreshRate = 60.0;
 const double kTestRefreshRate = 200.0;
 
-ui::ContextFactory* g_context_factory = NULL;
-
 const int kCompositorLockTimeoutMs = 67;
 
 }  // namespace
 
 namespace ui {
 
-// static
-ContextFactory* ContextFactory::GetInstance() {
-  DCHECK(g_context_factory);
-  return g_context_factory;
-}
-
-// static
-void ContextFactory::SetInstance(ContextFactory* instance) {
-  DCHECK_NE(!!g_context_factory, !!instance);
-  g_context_factory = instance;
-}
-
 CompositorLock::CompositorLock(Compositor* compositor)
     : compositor_(compositor) {
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&CompositorLock::CancelLock, AsWeakPtr()),
       base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
 }
 
 CompositorLock::~CompositorLock() {
   CancelLock();
 }
 
 void CompositorLock::CancelLock() {
   if (!compositor_)
     return;
   compositor_->UnlockCompositor();
   compositor_ = NULL;
 }
 
 }  // namespace ui
 
 namespace {
 
 }  // namespace
 
 namespace ui {
 
-Compositor::Compositor(gfx::AcceleratedWidget widget)
-    : context_factory_(g_context_factory),
-      root_layer_(NULL),
-      widget_(widget),
-      compositor_thread_loop_(g_context_factory->GetCompositorMessageLoop()),
-      vsync_manager_(new CompositorVSyncManager()),
-      device_scale_factor_(0.0f),
-      last_started_frame_(0),
-      last_ended_frame_(0),
-      disable_schedule_composite_(false),
-      compositor_lock_(NULL),
-      defer_draw_scheduling_(false),
-      waiting_on_compositing_end_(false),
-      draw_on_compositing_end_(false),
-      swap_state_(SWAP_NONE),
-      schedule_draw_factory_(this) {
-  Init();
-}
-
 Compositor::Compositor(gfx::AcceleratedWidget widget,
                        ui::ContextFactory* context_factory)
     : context_factory_(context_factory),
       root_layer_(NULL),
       widget_(widget),
       compositor_thread_loop_(context_factory->GetCompositorMessageLoop()),
       vsync_manager_(new CompositorVSyncManager()),
       device_scale_factor_(0.0f),
       last_started_frame_(0),
       last_ended_frame_(0),
       disable_schedule_composite_(false),
       compositor_lock_(NULL),
       defer_draw_scheduling_(false),
       waiting_on_compositing_end_(false),
       draw_on_compositing_end_(false),
       swap_state_(SWAP_NONE),
       schedule_draw_factory_(this) {
-  Init();
-}
-
-// Yes, this is the wrong place. I'm leaving here to minimize diffs since this
-// function will be nuked soonish.
-void Compositor::Init() {
   root_web_layer_ = cc::Layer::Create();
   root_web_layer_->SetAnchorPoint(gfx::PointF(0.f, 0.f));
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   cc::LayerTreeSettings settings;
   settings.refresh_rate =
       context_factory_->DoesCreateTestContexts()
       ? kTestRefreshRate
       : kDefaultRefreshRate;
@@ skipping 292 matching lines @@
     // CompositorObservers to be notified before starting another
     // draw cycle.
     ScheduleDraw();
   }
   FOR_EACH_OBSERVER(CompositorObserver,
                     observer_list_,
                     OnCompositingEnded(this));
 }
 
 }  // namespace ui