Drop kDisableAcceleratedVideoDecode in ContentBrowserTest::SetUp().

ContentBrowserTest calls renderer_main which will set
kDisableAcceleratedVideoDecode through
GpuDataManagerImplPrivate::AppendRendererCommandLine. So setting this flag here
is redundant.

R=fischman@chromium.org
TBR=zmo@chromium.org
BUG=none
TEST=none

Review URL: https://codereview.chromium.org/39413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231076 0039d316-1c4b-4281-b951-d872f2087c98

content/test/content_browser_test.cc

@@ -89,12 +89,6 @@ void ContentBrowserTest::SetUp() {
                                  subprocess_path);
 #endif
 
-  // NOTE: should be kept in sync with
-  // chrome/browser/resources/software_rendering_list.json
-#if !defined(OS_WIN) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-  command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
-#endif
-
   // LinuxInputMethodContextFactory has to be initialized.
 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11)
   ui::InitializeInputMethodForTesting();

gpu/config/software_rendering_list_json.cc

@@ -652,7 +652,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
     },
     {
       "id": 48,
-      // Please keep in sync with content/test/content_browser_test.cc.
       "description": "Accelerated video decode is unavailable on Mac and Linux.",
       "cr_bugs": [137247, 133828],
       "exceptions": [