Index: cc/test/fake_output_surface.h |
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h |
index d2af2e3d44c7400bf163e7dba965318379b9a862..066f0272cf41bfb68da9e4ae8ead898a83864fd9 100644 |
--- a/cc/test/fake_output_surface.h |
+++ b/cc/test/fake_output_surface.h |
@@ -23,15 +23,14 @@ |
~FakeOutputSurface() override; |
static scoped_ptr<FakeOutputSurface> Create3d() { |
- return make_scoped_ptr( |
- new FakeOutputSurface(TestContextProvider::Create(), |
- TestContextProvider::CreateWorker(), false)); |
+ return make_scoped_ptr(new FakeOutputSurface( |
+ TestContextProvider::Create(), TestContextProvider::Create(), false)); |
} |
static scoped_ptr<FakeOutputSurface> Create3d( |
scoped_refptr<ContextProvider> context_provider) { |
return make_scoped_ptr(new FakeOutputSurface( |
- context_provider, TestContextProvider::CreateWorker(), false)); |
+ context_provider, TestContextProvider::Create(), false)); |
} |
static scoped_ptr<FakeOutputSurface> Create3d( |
@@ -45,7 +44,7 @@ |
scoped_ptr<TestWebGraphicsContext3D> context) { |
return make_scoped_ptr( |
new FakeOutputSurface(TestContextProvider::Create(context.Pass()), |
- TestContextProvider::CreateWorker(), false)); |
+ TestContextProvider::Create(), false)); |
} |
static scoped_ptr<FakeOutputSurface> CreateSoftware( |
@@ -55,22 +54,21 @@ |
} |
static scoped_ptr<FakeOutputSurface> CreateDelegating3d() { |
- return make_scoped_ptr( |
- new FakeOutputSurface(TestContextProvider::Create(), |
- TestContextProvider::CreateWorker(), true)); |
+ return make_scoped_ptr(new FakeOutputSurface( |
+ TestContextProvider::Create(), TestContextProvider::Create(), true)); |
} |
static scoped_ptr<FakeOutputSurface> CreateDelegating3d( |
scoped_refptr<TestContextProvider> context_provider) { |
return make_scoped_ptr(new FakeOutputSurface( |
- context_provider, TestContextProvider::CreateWorker(), true)); |
+ context_provider, TestContextProvider::Create(), true)); |
} |
static scoped_ptr<FakeOutputSurface> CreateDelegating3d( |
scoped_ptr<TestWebGraphicsContext3D> context) { |
return make_scoped_ptr( |
new FakeOutputSurface(TestContextProvider::Create(context.Pass()), |
- TestContextProvider::CreateWorker(), true)); |
+ TestContextProvider::Create(), true)); |
} |
static scoped_ptr<FakeOutputSurface> CreateDelegatingSoftware( |