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

trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc

 // Copyright 2013 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 "chrome/browser/chromeos/login/chrome_restart_request.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 112 matching lines @@
       ::switches::kV,
       ash::switches::kAshTouchHud,
       ash::switches::kAuraLegacyPowerButton,
       ash::switches::kAshDisableNewNetworkStatusArea,
       // Please keep these in alphabetical order. Non-UI Compositor switches
       // here should also be added to
       // content/browser/renderer_host/render_process_host_impl.cc.
       cc::switches::kBackgroundColorInsteadOfCheckerboard,
       cc::switches::kCompositeToMailbox,
       cc::switches::kDisableCheapnessEstimator,
-      cc::switches::kDisableColorEstimator,
       cc::switches::kDisableImplSidePainting,
       cc::switches::kDisableThreadedAnimation,
       cc::switches::kEnableCompositorFrameMessage,
       cc::switches::kEnableImplSidePainting,
       cc::switches::kEnablePartialSwap,
       cc::switches::kEnablePerTilePainting,
       cc::switches::kEnablePredictionBenchmarking,
       cc::switches::kEnableRightAlignedScheduling,
       cc::switches::kEnableTopControlsPositionCalculation,
       cc::switches::kLowResolutionContentsScaleFactor,
       cc::switches::kNumRasterThreads,
       cc::switches::kShowCompositedLayerBorders,
       cc::switches::kShowCompositedLayerTree,
       cc::switches::kShowFPSCounter,
       cc::switches::kShowNonOccludingRects,
       cc::switches::kShowOccludingRects,
       cc::switches::kShowPropertyChangedRects,
       cc::switches::kShowReplicaScreenSpaceRects,
       cc::switches::kShowScreenSpaceRects,
       cc::switches::kShowSurfaceDamageRects,
       cc::switches::kSlowDownRasterScaleFactor,
       cc::switches::kTraceAllRenderedFrames,
       cc::switches::kTraceOverdraw,
+      cc::switches::kUseColorEstimator,
       cc::switches::kUIEnablePartialSwap,
       cc::switches::kUIEnablePerTilePainting,
       chromeos::switches::kDbusStub,
       gfx::switches::kEnableBrowserTextSubpixelPositioning,
       gfx::switches::kEnableWebkitTextSubpixelPositioning,
       views::corewm::switches::kNoDropShadows,
       views::corewm::switches::kWindowAnimationsDisabled,
   };
   command_line->CopySwitchesFrom(base_command_line,
                                  kForwardSwitches,
@@ skipping 157 matching lines @@
     // Relaunch chrome without session manager on dev box.
     ReLaunch(command_line);
     return;
   }
 
   // ChromeRestartRequest deletes itself after request sent to session manager.
   (new ChromeRestartRequest(command_line))->Start();
 }
 
 }  // namespace chromeos