Revert of Aura on Android: content/browser

content/browser/android/content_startup_flags.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 "content/browser/android/content_startup_flags.h"
 
 #include "base/android/build_info.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 62 matching lines @@
     parsed_command_line->AppendSwitchNative(
       switches::kRegisterPepperPlugins, plugin_descriptor);
   }
 
   // Disable profiler timing by default.
   if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {
     parsed_command_line->AppendSwitchASCII(
         switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
   }
 
-#if !defined(USE_AURA)
   cc::LayerSettings layer_settings;
   layer_settings.use_compositor_animation_timelines =
       !parsed_command_line->HasSwitch(
           switches::kDisableAndroidCompositorAnimationTimelines);
   Compositor::SetLayerSettings(layer_settings);
-#endif
 }
 
 }  // namespace content