Revert 125941 - Merge 125799 - [chromium] Impl scrolling crashes when the renderer's initialization…

Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp

Index: Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp
===================================================================
--- Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp	(revision 125969)
+++ Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp	(working copy)
@@ -187,11 +187,6 @@
     CCScopedSettings m_scopedSettings;
 };
 
-class FakeWebGraphicsContext3DMakeCurrentFails : public FakeWebGraphicsContext3D {
-public:
-    virtual bool makeContextCurrent() { return false; }
-};
-
 TEST_F(CCLayerTreeHostImplTest, scrollDeltaNoLayers)
 {
     ASSERT_FALSE(m_hostImpl->rootLayer());
@@ -278,21 +273,6 @@
     EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollIgnored);
 }
 
-TEST_F(CCLayerTreeHostImplTest, scrollWithoutRenderer)
-{
-    CCLayerTreeSettings settings;
-    m_hostImpl = CCLayerTreeHostImpl::create(settings, this);
-
-    // Initialization will fail here.
-    m_hostImpl->initializeLayerRenderer(FakeWebCompositorOutputSurface::create(adoptPtr(new FakeWebGraphicsContext3DMakeCurrentFails)), UnthrottledUploader);
-    m_hostImpl->setViewportSize(IntSize(10, 10), IntSize(10, 10));
-
-    setupScrollAndContentsLayers(IntSize(100, 100));
-
-    // We should not crash when trying to scroll after the renderer initialization fails.
-    EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollIgnored);
-}
-
 TEST_F(CCLayerTreeHostImplTest, replaceTreeWhileScrolling)
 {
     const int scrollLayerId = 1;
@@ -2131,11 +2111,13 @@
     EXPECT_TRUE(layer2->didLoseContextCalled());
 }
 
+class FakeWebGraphicsContext3DMakeCurrentFails : public FakeWebGraphicsContext3D {
+public:
+    virtual bool makeContextCurrent() { return false; }
+};
+
 TEST_F(CCLayerTreeHostImplTest, finishAllRenderingAfterContextLost)
 {
-    CCLayerTreeSettings settings;
-    m_hostImpl = CCLayerTreeHostImpl::create(settings, this);
-
     // The context initialization will fail, but we should still be able to call finishAllRendering() without any ill effects.
     m_hostImpl->initializeLayerRenderer(CCGraphicsContext::create3D(adoptPtr(new FakeWebGraphicsContext3DMakeCurrentFails)), UnthrottledUploader);
     m_hostImpl->finishAllRendering();