Remove unused include and always-true compile-time check

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 131 matching lines @@
       disable_schedule_composite_(false) {
   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;
 
-#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
-  settings.partialSwapEnabled =
-      command_line->HasSwitch(switches::kUIEnablePartialSwap);
-  settings.perTilePainting =
-      command_line->HasSwitch(switches::kUIEnablePerTilePainting);
-#endif
-
   host_.initialize(this, root_web_layer_, settings);
   host_.setSurfaceReady();
   root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
 }
 
 Compositor::~Compositor() {
   // Don't call |CompositorDelegate::ScheduleDraw| from this point.
   delegate_ = NULL;
   // There's a cycle between |root_web_layer_| and |host_|, which results in
   // leaking and/or crashing. Explicitly set the root layer to NULL so the cycle
   // is broken.
   host_.setRootLayer(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.
   host_.reset();
 
   if (!test_compositor_enabled)
     ContextFactory::GetInstance()->RemoveCompositor(this);
 }
 
 void Compositor::Initialize(bool use_thread) {
-#if defined(WEBCOMPOSITOR_OWNS_SETTINGS)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   // These settings must be applied before we initialize the compositor.
   WebKit::WebCompositor::setPartialSwapEnabled(
       command_line->HasSwitch(switches::kUIEnablePartialSwap));
   WebKit::WebCompositor::setPerTilePaintingEnabled(
       command_line->HasSwitch(switches::kUIEnablePerTilePainting));
-#endif
   if (use_thread)
     g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
   WebKit::WebCompositor::initialize(g_compositor_thread);
 }
 
 void Compositor::Terminate() {
   WebKit::WebCompositor::shutdown();
   if (g_compositor_thread) {
     delete g_compositor_thread;
     g_compositor_thread = NULL;
@@ skipping 224 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui