Removes useage of deprecated Compositor constructor

I'm doing to ultimately remove ContextFactory::Set/GetInstance().

BUG=none
TEST=none
R=jbauman@chromium.org

Review URL: https://codereview.chromium.org/301233005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273962 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/compositor/browser_compositor_view_mac.mm

@@ -9,6 +9,7 @@
 #include "content/browser/renderer_host/compositing_iosurface_context_mac.h"
 #include "content/browser/renderer_host/compositing_iosurface_mac.h"
 #include "content/browser/renderer_host/software_layer_mac.h"
+#include "content/public/browser/context_factory.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/gl/scoped_cgl.h"
 
@@ -44,7 +45,7 @@
     [self setLayer:background_layer_];
     [self setWantsLayer:YES];
 
-    compositor_.reset(new ui::Compositor(self));
+    compositor_.reset(new ui::Compositor(self, content::GetContextFactory()));
     [view addSubview:self];
   }
   return self;

content/browser/compositor/image_transport_factory_browsertest.cc

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "content/browser/compositor/image_transport_factory.h"
+
 #include "base/run_loop.h"
 #include "cc/output/context_provider.h"
-#include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/compositor/owned_mailbox.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/test/content_browser_test.h"
@@ -16,7 +17,7 @@
 namespace content {
 namespace {
 
-class ImageTransportFactoryBrowserTest : public ContentBrowserTest {};
+typedef ContentBrowserTest ImageTransportFactoryBrowserTest;
 
 class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
  public:
@@ -51,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest,
   EXPECT_CALL(observer, OnLostResources())
       .WillOnce(testing::InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
 
-  ui::ContextFactory* context_factory = ui::ContextFactory::GetInstance();
+  ui::ContextFactory* context_factory = factory->GetContextFactory();
   gpu::gles2::GLES2Interface* gl =
       context_factory->SharedMainThreadContextProvider()->ContextGL();
   gl->LoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,

content/content_browser.gypi

@@ -1694,8 +1694,6 @@
         ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'],
         ['exclude', '^browser/renderer_host/ui_events_helper.cc'],
         ['exclude', '^browser/renderer_host/ui_events_helper.h'],
-        ['exclude', '^browser/context_factory.cc'],
-        ['exclude', '^public/browser/context_factory.h'],
       ],
     }],
     ['use_aura==1 or OS=="mac"', {
@@ -1705,6 +1703,8 @@
     }, {
       'sources/': [
         ['exclude', '^browser/compositor/'],
+        ['exclude', '^browser/context_factory.cc'],
+        ['exclude', '^public/browser/context_factory.h'],
       ]
     }],
     ['enable_plugins==1', {