about_flags.cc entry for WebRTC-H264WithOpenH264FFmpeg

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 192be1f264cd9115e9f4e717dfe13f088558b4df..85cd0e741abe6f6a0ee0b2f22a26e21c2b433cc1 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -56,6 +56,8 @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
+#include "content/public/common/features.h"
 #include "grit/components_strings.h"
 #include "media/base/media_switches.h"
 #include "media/midi/midi_switches.h"
@@ -1801,13 +1803,20 @@ const FeatureEntry kFeatureEntries[] = {
 #if defined(ENABLE_EXTENSIONS)
     {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE,
      IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
-     SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)}
+     SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)},
 #endif
 #if defined(OS_ANDROID)
     {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
      IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)},
 #endif  // defined(OS_ANDROID)
+#if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)

[jochen (gone - plz use gerrit), 2016/03/02 11:03:42]

how bad is it that the generated resources if block does not match these
defines?

[hbos_chromium, 2016/03/02 12:54:56]

Not sure, but the other WebRTC features which are also behind #if
defined(ENABLE_WEBRTC) have no corresponding if in the generated_resources.grd
file.

The generated_resources.grd if's are mostly about the OS. I don't know the
significance of this considering even if its not supported on the current OS the
feature is still listed as a an unsupported experiment in chrome://flags,
including the generated resources texts that are if'd.

[Alexei Svitkine (slow), 2016/03/02 17:29:46]

I think if the generated resources if doesn't match, the end result is these
strings being part of the build for platforms that don't support them - which
does incur bloat. So if it's easy, better to make it match, but not the end of
the world if it's tricky.

[hbos_chromium, 2016/03/03 16:51:42]

Done. It was doable. Matching .grd with the #if, replacing the previous if-expr
matching the kOs.. stuff which was incorrect.

+    {"enable-webrtc-h264-with-openh264-ffmpeg",
+     IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
+     IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION,
+     kOsMac | kOsWin | kOsLinux | kOsCrOS,
+     FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
+#endif  // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.