Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)"

Source/web/tests/ScrollingCoordinatorChromiumTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 274 matching lines @@
     // all the way to the WebLayer.
     Element* scrollableElement = m_webViewImpl->mainFrameImpl()->frame()->document()->getElementById("scrollable");
     ASSERT(scrollableElement);
 
     RenderObject* renderer = scrollableElement->renderer();
     ASSERT_TRUE(renderer->isBoxModelObject());
     ASSERT_TRUE(renderer->hasLayer());
 
     RenderLayer* layer = toRenderBoxModelObject(renderer)->layer();
     ASSERT_TRUE(layer->usesCompositedScrolling());
-    ASSERT_EQ(PaintsIntoOwnBacking, layer->compositingState());
+    ASSERT_TRUE(layer->isComposited());
 
     CompositedLayerMapping* compositedLayerMapping = layer->compositedLayerMapping();
     ASSERT_TRUE(compositedLayerMapping->hasScrollingLayer());
     ASSERT(compositedLayerMapping->scrollingContentsLayer());
 
     GraphicsLayer* graphicsLayer = compositedLayerMapping->scrollingContentsLayer();
     ASSERT_EQ(layer->scrollableArea(), graphicsLayer->scrollableArea());
 
     WebLayer* webScrollLayer = compositedLayerMapping->scrollingContentsLayer()->platformLayer();
     ASSERT_TRUE(webScrollLayer->scrollable());
@@ skipping 91 matching lines @@
 
 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash)
 {
     registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html");
     navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html");
     // This test document setup an iframe with scrollbars, then switch to
     // an empty document by javascript.
 }
 
 } // namespace