Remove transitional WEBLAYERTREEVIEW_IS_PURE_VIRTUAL guarded code

ui/compositor/compositor.cc

 // Copyright (c) 2012 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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 136 matching lines @@
   WebKit::WebLayerTreeView::Settings settings;
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   settings.showFPSCounter =
       command_line->HasSwitch(switches::kUIShowFPSCounter);
   settings.showPlatformLayerTree =
       command_line->HasSwitch(switches::kUIShowLayerTree);
   settings.refreshRate =
       test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
 
   root_web_layer_->setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
-#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)
   host_.reset(WebKit::WebLayerTreeView::create(this, *root_web_layer_,
                                                settings));
   host_->setSurfaceReady();
-#else
-  host_.initialize(this, *root_web_layer_, settings);
-  host_.setSurfaceReady();
-#endif
 }
 
 Compositor::~Compositor() {
   // Don't call |CompositorDelegate::ScheduleDraw| from this point.
   delegate_ = NULL;
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
 
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
@@ skipping 21 matching lines @@
     delete g_compositor_thread;
     g_compositor_thread = NULL;
   }
 }
 
 void Compositor::ScheduleDraw() {
   if (g_compositor_thread) {
     // TODO(nduca): Temporary while compositor calls
     // compositeImmediately() directly.
     layout();
-#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)
     host_->composite();
-#else
-    host_.composite();
-#endif
   } else if (delegate_) {
     delegate_->ScheduleDraw();
   }
 }
 
 void Compositor::SetRootLayer(Layer* root_layer) {
   if (root_layer_ == root_layer)
     return;
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
@@ skipping 11 matching lines @@
 
   last_started_frame_++;
   if (!g_compositor_thread)
     FOR_EACH_OBSERVER(CompositorObserver,
                       observer_list_,
                       OnCompositingWillStart(this));
 
   // TODO(nduca): Temporary while compositor calls
   // compositeImmediately() directly.
   layout();
-#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)
   host_->composite();
-#else
-  host_.composite();
-#endif
   if (!g_compositor_thread && !swap_posted_)
     NotifyEnd();
 }
 
 void Compositor::ScheduleFullDraw() {
-#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)
   host_->setNeedsRedraw();
-#else
-  host_.setNeedsRedraw();
-#endif
 }
 
 bool Compositor::ReadPixels(SkBitmap* bitmap,
                             const gfx::Rect& bounds_in_pixel) {
   if (bounds_in_pixel.right() > size().width() ||
       bounds_in_pixel.bottom() > size().height())
     return false;
   // Convert to OpenGL coordinates.
   gfx::Point new_origin(
       bounds_in_pixel.x(),
       size().height() - bounds_in_pixel.height() - bounds_in_pixel.y());
 
   bitmap->setConfig(SkBitmap::kARGB_8888_Config,
                     bounds_in_pixel.width(), bounds_in_pixel.height());
   bitmap->allocPixels();
   SkAutoLockPixels lock_image(*bitmap);
   unsigned char* pixels = static_cast<unsigned char*>(bitmap->getPixels());
-#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)
   if (host_->compositeAndReadback(
-#else
-  if (host_.compositeAndReadback(
-#endif
           pixels, gfx::Rect(new_origin, bounds_in_pixel.size()))) {
     SwizzleRGBAToBGRAAndFlip(pixels, bounds_in_pixel.size());
     return true;
   }
   return false;
 }
 
 void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) {
   DCHECK_GT(scale, 0);
   if (size_in_pixel.IsEmpty() || scale <= 0)
     return;
   size_ = size_in_pixel;
-#if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL)
   host_->setViewportSize(size_in_pixel);
-#else
-  host_.setViewportSize(size_in_pixel);
-#endif
   root_web_layer_->setBounds(size_in_pixel);
 
   if (device_scale_factor_ != scale) {
     device_scale_factor_ = scale;
     if (root_layer_)
       root_layer_->OnDeviceScaleFactorChanged(scale);
   }
 }
 
 void Compositor::AddObserver(CompositorObserver* observer) {
@@ skipping 179 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui