aura: Clean up compositor initialization/destruction.

content/test/content_browser_test.cc

 // Copyright (c) 2011 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/test/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 62 matching lines @@
   base::FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   subprocess_path = subprocess_path.DirName().DirName();
   DCHECK_EQ(subprocess_path.BaseName().value(), "Contents");
   subprocess_path = subprocess_path.Append(
       "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper");
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
                                  subprocess_path);
 #endif
 
-  // NOTE: should be kept in sync with
-  // chrome/browser/resources/software_rendering_list.json
-#if !defined(OS_WIN) && !defined(OS_CHROMEOS)
-  command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
-#endif
-
   BrowserTestBase::SetUp();
 }
 
 void ContentBrowserTest::TearDown() {
   BrowserTestBase::TearDown();
 
   shell_main_delegate_.reset();
 }
 
 void ContentBrowserTest::RunTestOnMainThreadLoop() {
@@ skipping 49 matching lines @@
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
   return Shell::CreateNewWindow(
       ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
       gfx::Size());
 }
 
 }  // namespace content