Revert 228225 "Enable delegated rendering on Aura Windows and Li..."

content/browser/gpu/compositor_util.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/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "content/public/browser/gpu_data_manager.h"
@@ skipping 94 matching lines @@
   return base::win::GetVersion() >= base::win::VERSION_VISTA;
 #endif
 
   return false;
 }
 
 bool IsDelegatedRendererEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool enabled = false;
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
-  // Enable on non-ChromeOS Aura. Chrome OS has driver issues on some platforms:
-  // https://code.google.com/p/chrome-os-partner/issues/detail?id=22688
-  enabled = true;
-#endif
-
   // Flags override.
   enabled |= command_line.HasSwitch(switches::kEnableDelegatedRenderer);
   enabled &= !command_line.HasSwitch(switches::kDisableDelegatedRenderer);
 
   // Needs compositing, and thread.
   if (enabled &&
       (!IsForceCompositingModeEnabled() || !IsThreadedCompositingEnabled())) {
     enabled = false;
     LOG(ERROR) << "Disabling delegated-rendering because it needs "
                << "force-compositing-mode and threaded-compositing.";
   }
 
   return enabled;
 }
 
 bool IsDeadlineSchedulingEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   // Default to disabled.
   bool enabled = false;
 
   // Flags override.
   enabled |= command_line.HasSwitch(switches::kEnableDeadlineScheduling);
   enabled &= !command_line.HasSwitch(switches::kDisableDeadlineScheduling);
 
   return enabled;
 }
 
 }  // namespace content