Create VTVideoDecodeAccelerator

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0118e1bd10336925737e032a78ac399a7e4e849d..f41a61e49ccb4eaeb70f8685f0c0fef07c14cb26 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -427,16 +427,6 @@ const Experiment::Choice kMalwareInterstitialVersions[] = {
     switches::kMalwareInterstitialVersionV3, "" },
 };
 
-#if defined(OS_CHROMEOS)

[scherkus (not reviewing), 2014/06/09 16:02:06]

bad merge? looks like you have a bunch of related changes

[sandersd (OOO until July 31), 2014/06/10 01:02:44]

Ugh, that's no good. Probably happened when I transferred the branch from my
workstation to the laptop.

-const Experiment::Choice kEnableFileManagerMTPChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    chromeos::switches::kEnableFileManagerMTP, "true" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    chromeos::switches::kEnableFileManagerMTP, "false" }
-};
-#endif
-
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
@@ -1038,7 +1028,7 @@ const Experiment kExperiments[] = {
   { "disable-accelerated-video-decode",
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
-    kOsWin | kOsCrOS,
+    kOsMac | kOsWin | kOsCrOS,

[scherkus (not reviewing), 2014/06/09 16:02:06]

is this change needed or does --ignore-gpu-blacklist suffice for now

I believe the blacklist is the main mechanism that disables GPU decode on mac
today:
https://code.google.com/p/chromium/codesearch#chromium/src/gpu/config/softwar...
https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/gp...

[sandersd (OOO until July 31), 2014/06/10 01:02:44]

Done.

     SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
   },
 #if defined(USE_ASH)
@@ -1155,7 +1145,7 @@ const Experiment kExperiments[] = {
     "enable-touch-editing",
     IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME,
     IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION,
-    kOsCrOS | kOsWin | kOsLinux,
+    kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing,
                               switches::kDisableTouchEditing)
   },
@@ -1794,7 +1784,7 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME,
     IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION,
     kOsCrOS,
-    MULTI_VALUE_TYPE(kEnableFileManagerMTPChoices)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP)
   },
 #endif
   // TODO(tyoshino): Remove this temporary flag and command line switch. See