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

cc/blink/web_image_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_image_layer_impl.h"
 
 #include "cc/blink/web_layer_impl.h"
 #include "cc/blink/web_layer_impl_fixed_bounds.h"
 #include "cc/layers/image_layer.h"
 #include "cc/layers/picture_image_layer.h"
 
 namespace cc_blink {
 
 WebImageLayerImpl::WebImageLayerImpl() {
-  if (WebLayerImpl::UsingPictureLayer())
-    layer_.reset(new WebLayerImplFixedBounds(
-        cc::PictureImageLayer::Create(WebLayerImpl::LayerSettings())));
-  else
-    layer_.reset(new WebLayerImpl(
-        cc::ImageLayer::Create(WebLayerImpl::LayerSettings())));
+  layer_.reset(new WebLayerImplFixedBounds(
+      cc::PictureImageLayer::Create(WebLayerImpl::LayerSettings())));
 }
 
 WebImageLayerImpl::~WebImageLayerImpl() {
 }
 
 blink::WebLayer* WebImageLayerImpl::layer() {
   return layer_.get();
 }
 
 void WebImageLayerImpl::setImageBitmap(const SkBitmap& bitmap) {
-  if (WebLayerImpl::UsingPictureLayer()) {
-    static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap);
-    static_cast<WebLayerImplFixedBounds*>(layer_.get())
-        ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height()));
-  } else {
-    static_cast<cc::ImageLayer*>(layer_->layer())->SetBitmap(bitmap);
-  }
+  static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap);
+  static_cast<WebLayerImplFixedBounds*>(layer_.get())
+      ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height()));
 }
 
 void WebImageLayerImpl::setNearestNeighbor(bool nearest_neighbor) {
-  if (WebLayerImpl::UsingPictureLayer()) {
-    static_cast<cc::PictureImageLayer*>(layer_->layer())
-        ->SetNearestNeighbor(nearest_neighbor);
-  }
+  static_cast<cc::PictureImageLayer*>(layer_->layer())
+      ->SetNearestNeighbor(nearest_neighbor);
 }
 
 }  // namespace cc_blink