Revert of cc: Remove the --enable-partial-swap flag.

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/command_line.h"
@@ skipping 161 matching lines @@
       cc::switches::kDisableCompositedAntialiasing,
       cc::switches::kDisableCompositorTouchHitTesting,
       cc::switches::kDisableGPURasterization,
       cc::switches::kDisableImplSidePainting,
       cc::switches::kDisableMapImage,
       cc::switches::kDisableThreadedAnimation,
       cc::switches::kEnableGpuBenchmarking,
       cc::switches::kEnableGPURasterization,
       cc::switches::kEnableImplSidePainting,
       cc::switches::kEnableMapImage,
+      cc::switches::kEnablePartialSwap,
       cc::switches::kEnablePerTilePainting,
       cc::switches::kEnablePinchVirtualViewport,
       cc::switches::kEnableTopControlsPositionCalculation,
       cc::switches::kMaxTilesForInterestArea,
       cc::switches::kMaxUnusedResourceMemoryUsagePercentage,
       cc::switches::kShowCompositedLayerBorders,
       cc::switches::kShowFPSCounter,
       cc::switches::kShowLayerAnimationBounds,
       cc::switches::kShowNonOccludingRects,
       cc::switches::kShowOccludingRects,
@@ skipping 39 matching lines @@
   // Copying switches won't be needed when Guest mode won't need restart
   // http://crosbug.com/6924
   if (base_command_line.HasSwitch(::switches::kRegisterPepperPlugins)) {
     cmd_line_str += base::StringPrintf(
         kSwitchFormatString,
         ::switches::kRegisterPepperPlugins,
         base_command_line.GetSwitchValueNative(
             ::switches::kRegisterPepperPlugins).c_str());
   }
 
+  // TODO(zelidrag): Remove this hack that get us around compositing bug from
+  // http://crbug.com/179256 once that bug is resolved.
+  if (command_line->HasSwitch(::switches::kForceAppMode)) {
+    std::string switch_to_remove("--");
+    switch_to_remove.append(cc::switches::kEnablePartialSwap);
+    cmd_line_str = cmd_line_str.replace(cmd_line_str.find(switch_to_remove),
+                                        switch_to_remove.length(), "");
+  }
+
   return cmd_line_str;
 }
 
 // Simulates a session manager restart by launching give command line
 // and exit current process.
 void ReLaunch(const std::string& command_line) {
   std::vector<std::string> argv;
 
   // This is not a proper way to get |argv| but it's good enough for debugging.
   base::SplitString(command_line, ' ', &argv);
@@ skipping 113 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