Merge to M46 for BUG=510252

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 59 matching lines @@
     ::switches::kBlinkSettings,
     ::switches::kDisableAccelerated2dCanvas,
     ::switches::kDisableAcceleratedJpegDecoding,
     ::switches::kDisableAcceleratedMjpegDecode,
     ::switches::kDisableAcceleratedVideoDecode,
     ::switches::kDisableBlinkFeatures,
     ::switches::kDisableCastStreamingHWEncoding,
     ::switches::kDisableDelegatedRenderer,
     ::switches::kDisableDistanceFieldText,
     ::switches::kDisableGpu,
+    ::switches::kDisableGpuMemoryBufferVideoFrames,
     ::switches::kDisableGpuShaderDiskCache,
     ::switches::kDisableGpuWatchdog,
     ::switches::kDisableGpuCompositing,
     ::switches::kDisableGpuRasterization,
     ::switches::kDisableLowResTiling,
     ::switches::kDisableMediaSource,
     ::switches::kDisableOneCopy,
     ::switches::kDisablePersistentGpuMemoryBuffer,
     ::switches::kDisablePreferCompositingToLCDText,
     ::switches::kDisablePrefixedEncryptedMedia,
@@ skipping 268 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.argv()))->Start();
 }
 
 }  // namespace chromeos