Revert of Revert of Enable display list 2D canvas by default

content/shell/app/shell_main_delegate.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/shell/app/shell_main_delegate.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file.h"
@@ skipping 155 matching lines @@
     if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) {
       command_line.AppendSwitch(switches::kDisableThreadedCompositing);
       command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
       command_line.AppendSwitch(switches::kDisableImplSidePainting);
       // Text blobs are normally disabled when kDisableImplSidePainting is
       // present to ensure correct LCD behavior, but for layout tests we want
       // them on because LCD is always suppressed.
       command_line.AppendSwitch(switches::kForceTextBlobs);
     }
 
+    if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) {
+      command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas);
+    }
+
     command_line.AppendSwitch(switches::kEnableInbandTextTracks);
     command_line.AppendSwitch(switches::kMuteAudio);
 
     // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
     command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
     command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
 
     command_line.AppendSwitch(switches::kEnableFileCookies);
 
     command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
@@ skipping 136 matching lines @@
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ?
           new LayoutTestContentRendererClient :
           new ShellContentRendererClient);
 
   return renderer_client_.get();
 }
 
 }  // namespace content