aura: Remove CreateOffscreenContext from ui::ContextFactory.

Drop this method since it is not needed in the interface anymore. In
order to do this, make the cc::FakeContextProvider externally available
so ui::Compositor can make use of it for tests, and revamp it to make
it slightly more general.

Depends on: https://codereview.chromium.org/22293003/

R=jbauman, piman
BUG=258625

Review URL: https://chromiumcodereview.appspot.com/21026005

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

1 files changed, 11 insertions, 8 deletions

diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index b182fe6..fb278ef 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ -18,19 +19,21 @@
 #include "cc/debug/fake_web_graphics_context_3d.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
-namespace WebKit { struct WebGraphicsMemoryAllocation; }
+namespace WebKit {
+class WebGraphicsContext3D;
+struct WebGraphicsMemoryAllocation;
+}
 
 namespace cc {
 
 class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
  public:
-  static scoped_ptr<TestWebGraphicsContext3D> Create() {
-    return make_scoped_ptr(new TestWebGraphicsContext3D());
-  }
-  static scoped_ptr<TestWebGraphicsContext3D> Create(
-      const WebKit::WebGraphicsContext3D::Attributes& attributes) {
-    return make_scoped_ptr(new TestWebGraphicsContext3D(attributes));
-  }
+  static scoped_ptr<TestWebGraphicsContext3D> Create();
+  static base::Callback<
+    scoped_ptr<TestWebGraphicsContext3D>()> CreateFactory();
+  static base::Callback<
+    scoped_ptr<WebKit::WebGraphicsContext3D>()> CreateBaseFactory();
+
   virtual ~TestWebGraphicsContext3D();
 
   virtual bool makeContextCurrent();