Don't disable forceCompositingMode in PinchViewportTest.TestWebViewResizedBeforeAttachment.

Source/web/tests/PinchViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/frame/PinchViewport.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 181 matching lines @@
     // Resizing the pinch viewport shouldn't affect the WebView.
     IntSize newViewportSize = IntSize(320, 200);
     pinchViewport.setSize(newViewportSize);
     EXPECT_SIZE_EQ(webViewSize, IntSize(webViewImpl()->size()));
     EXPECT_SIZE_EQ(newViewportSize, pinchViewport.size());
 }
 
 static void turnOffForceCompositingMode(WebSettings* settings)
 {
     PinchViewportTest::configureSettings(settings);
-    settings->setForceCompositingMode(false);
+    // FIXME: This setting is being removed, so this test needs to be rewritten to
+    // do something else. crbug.com/173949
+    settings->setAcceleratedCompositingEnabled(false);
 }
 
 // Test that the container layer gets sized properly if the WebView is resized
 // prior to the PinchViewport being attached to the layer tree.
 TEST_F(PinchViewportTest, TestWebViewResizedBeforeAttachment)
 {
     initializeWithDesktopSettings(turnOffForceCompositingMode);
     webViewImpl()->resize(IntSize(320, 240));
 
     navigateTo("about:blank");
     forceFullCompositingUpdate();
-    webViewImpl()->enterForceCompositingMode(true);
+    webViewImpl()->settings()->setAcceleratedCompositingEnabled(true);
+    webViewImpl()->layout();
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     EXPECT_FLOAT_SIZE_EQ(FloatSize(320, 240), pinchViewport.rootGraphicsLayer()->size());
 }
-
 // Make sure that the visibleRect method acurately reflects the scale and scroll location
 // of the viewport.
 TEST_F(PinchViewportTest, TestVisibleRect)
 {
     initializeWithDesktopSettings();
     webViewImpl()->resize(IntSize(320, 240));
 
     navigateTo("about:blank");
     forceFullCompositingUpdate();
 
@@ skipping 489 matching lines @@
 
     mouseDownEvent.button = WebMouseEvent::ButtonRight;
     webViewImpl()->handleInputEvent(mouseDownEvent);
     webViewImpl()->handleInputEvent(mouseUpEvent);
 
     // Reset the old client so destruction can occur naturally.
     webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 } // namespace