Remove non-impl-side painting as an option for blink.

cc/blink/web_content_layer_impl.cc

 // 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 "cc/blink/web_content_layer_impl.h"
 
 #include "cc/blink/web_display_item_list_impl.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/playback/display_item_list_settings.h"
@@ skipping 21 matching lines @@
       return blink::WebContentLayerClient::DisplayListCachingDisabled;
     case cc::ContentLayerClient::DISPLAY_LIST_PAINTING_DISABLED:
       return blink::WebContentLayerClient::DisplayListPaintingDisabled;
   }
   NOTREACHED();
   return blink::WebContentLayerClient::PaintDefaultBehavior;
 }
 
 WebContentLayerImpl::WebContentLayerImpl(blink::WebContentLayerClient* client)
     : client_(client) {
-  if (WebLayerImpl::UsingPictureLayer())
-    layer_ = make_scoped_ptr(new WebLayerImpl(
-        PictureLayer::Create(WebLayerImpl::LayerSettings(), this)));
-  else
-    layer_ = make_scoped_ptr(new WebLayerImpl(
-        ContentLayer::Create(WebLayerImpl::LayerSettings(), this)));
+  layer_ = make_scoped_ptr(new WebLayerImpl(
+      PictureLayer::Create(WebLayerImpl::LayerSettings(), this)));
   layer_->layer()->SetIsDrawable(true);
 }
 
 WebContentLayerImpl::~WebContentLayerImpl() {
-  if (WebLayerImpl::UsingPictureLayer())
-    static_cast<PictureLayer*>(layer_->layer())->ClearClient();
-  else
-    static_cast<ContentLayer*>(layer_->layer())->ClearClient();
+  static_cast<PictureLayer*>(layer_->layer())->ClearClient();
 }
 
 blink::WebLayer* WebContentLayerImpl::layer() {
   return layer_.get();
 }
 
 void WebContentLayerImpl::setDoubleSided(bool double_sided) {
   layer_->layer()->SetDoubleSided(double_sided);
 }
 
@@ skipping 26 matching lines @@
   }
   display_list->Finalize();
   return display_list;
 }
 
 bool WebContentLayerImpl::FillsBoundsCompletely() const {
   return false;
 }
 
 }  // namespace cc_blink