Removes usage of Compositor/ContextFactory methods

ui/compositor/test/context_factories_for_test.cc

 // Copyright 2013 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/context_factories_for_test.h"
 
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
@@ skipping 12 matching lines @@
 // static
 ui::ContextFactory* InitializeContextFactoryForTests(bool enable_pixel_output) {
   DCHECK(!g_implicit_factory) <<
       "ContextFactory for tests already initialized.";
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
     enable_pixel_output = true;
   if (enable_pixel_output)
     g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
   g_implicit_factory = new InProcessContextFactory();
-  ContextFactory::SetInstance(g_implicit_factory);
   return g_implicit_factory;
 }
 
 void TerminateContextFactoryForTests() {
-  ContextFactory::SetInstance(NULL);
   delete g_implicit_factory;
   g_implicit_factory = NULL;
   delete g_disable_null_draw;
   g_disable_null_draw = NULL;
 }
 
 }  // namespace ui