Aura: Browser-side changes for Composite-To-Mailbox

cc/layer_tree_host_impl_unittest.cc

Index: cc/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index a5fa578ab4eed7917dfc2247545cc121d08828f1..f019dce873202c72ed0b8c4d4e67e4c93044aaa0 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -2392,9 +2392,10 @@ public:
 
 TEST_P(LayerTreeHostImplTest, noPartialSwap)
 {
-    scoped_ptr<OutputSurface> outputSurface = FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(new MockContext)).PassAs<OutputSurface>();
-    MockContext* mockContext = static_cast<MockContext*>(outputSurface->context3d());
+    MockContext* mockContext = new MockContext;
     MockContextHarness harness(mockContext);
+    scoped_ptr<OutputSurface> outputSurface = FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(mockContext)).PassAs<OutputSurface>();
+    DCHECK(mockContext == static_cast<MockContext*>(outputSurface->context3d()));
 
     // Run test case
     createLayerTreeHost(false, outputSurface.Pass());
@@ -2426,9 +2427,10 @@ TEST_P(LayerTreeHostImplTest, noPartialSwap)
 
 TEST_P(LayerTreeHostImplTest, partialSwap)
 {
-    scoped_ptr<OutputSurface> outputSurface = FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(new MockContext)).PassAs<OutputSurface>();
-    MockContext* mockContext = static_cast<MockContext*>(outputSurface->context3d());
+    MockContext* mockContext = new MockContext;
     MockContextHarness harness(mockContext);
+    scoped_ptr<OutputSurface> outputSurface = FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(mockContext)).PassAs<OutputSurface>();
+    DCHECK(mockContext == static_cast<MockContext*>(outputSurface->context3d()));
 
     createLayerTreeHost(true, outputSurface.Pass());
     setupRootLayerImpl(FakeLayerWithQuads::create(m_hostImpl->activeTree(), 1));