Revert 190067 "Re-land: cc: Enable solid color prediction by def..."

trunk/src/cc/base/switches.h

 // 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.
 
 // Defines all the "cc" command-line switches.
 
 #ifndef CC_BASE_SWITCHES_H_
 #define CC_BASE_SWITCHES_H_
 
 #include "cc/base/cc_export.h"
 
 // Since cc is used from the render process, anything that goes here also needs
 // to be added to render_process_host_impl.cc.
 
 namespace cc {
 namespace switches {
 
 // Switches for the renderer compositor only.
 CC_EXPORT extern const char kBackgroundColorInsteadOfCheckerboard[];
 CC_EXPORT extern const char kDisableThreadedAnimation[];
 CC_EXPORT extern const char kEnableCompositorFrameMessage[];
 CC_EXPORT extern const char kDisableCheapnessEstimator[];
-CC_EXPORT extern const char kDisableColorEstimator[];
 CC_EXPORT extern const char kDisableImplSidePainting[];
 CC_EXPORT extern const char kEnableImplSidePainting[];
 CC_EXPORT extern const char kEnablePredictionBenchmarking[];
 CC_EXPORT extern const char kEnableRightAlignedScheduling[];
 CC_EXPORT extern const char kEnableTopControlsPositionCalculation[];
 CC_EXPORT extern const char kJankInsteadOfCheckerboard[];
 CC_EXPORT extern const char kNumRasterThreads[];
 CC_EXPORT extern const char kTraceOverdraw[];
 CC_EXPORT extern const char kTopControlsHeight[];
 CC_EXPORT extern const char kTopControlsHideThreshold[];
 CC_EXPORT extern const char kTopControlsShowThreshold[];
 CC_EXPORT extern const char kTraceAllRenderedFrames[];
 CC_EXPORT extern const char kSlowDownRasterScaleFactor[];
+CC_EXPORT extern const char kUseColorEstimator[];
 CC_EXPORT extern const char kLowResolutionContentsScaleFactor[];
 CC_EXPORT extern const char kCompositeToMailbox[];
 
 // Switches for both the renderer and ui compositors.
 CC_EXPORT extern const char kEnablePartialSwap[];
 CC_EXPORT extern const char kUIEnablePartialSwap[];
 CC_EXPORT extern const char kEnablePerTilePainting[];
 CC_EXPORT extern const char kUIEnablePerTilePainting[];
 
 // Debug visualizations.
@@ skipping 15 matching lines @@
 CC_EXPORT extern const char kUIShowOccludingRects[];
 CC_EXPORT extern const char kShowNonOccludingRects[];
 CC_EXPORT extern const char kUIShowNonOccludingRects[];
 
 CC_EXPORT bool IsImplSidePaintingEnabled();
 
 }  // namespace switches
 }  // namespace cc
 
 #endif  // CC_BASE_SWITCHES_H_