Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert the preprocessor define to a buildflag
//header defined in //media. The build arg is kept in //build/config/features.gni due to a dependency on WebRTC (described in a comment).

R=xhwang@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/866e43b5348172572654dde22dfcf0556fe47d26

[brettw, 2016-12-13 22:10:02]

The CQ bit was checked by brettw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-13 22:10:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[brettw, 2016-12-13 22:14:15]

brettw@chromium.org changed reviewers:
+ xhwang@chromium.org

[commit-bot: I haz the power, 2016-12-13 22:16:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-13 22:16:27]

Dry run: Try jobs failed on following builders:
  android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...)
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...)
  ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)

[xhwang, 2016-12-13 22:45:04]

lgtm with a question

https://codereview.chromium.org/2572883002/diff/1/media/BUILD.gn
File media/BUILD.gn (right):

https://codereview.chromium.org/2572883002/diff/1/media/BUILD.gn#newcode28
media/BUILD.gn:28: "USE_PROPRIETARY_CODECS=$proprietary_codecs",
not related to this CL, but do we have a general recommendation on ENABLE vs USE
in the build flag and/or in the gn args?

[brettw, 2016-12-13 22:57:15]

https://codereview.chromium.org/2572883002/diff/1/media/BUILD.gn
File media/BUILD.gn (right):

https://codereview.chromium.org/2572883002/diff/1/media/BUILD.gn#newcode28
media/BUILD.gn:28: "USE_PROPRIETARY_CODECS=$proprietary_codecs",
On 2016/12/13 22:45:04, xhwang wrote:
> not related to this CL, but do we have a general recommendation on ENABLE vs
USE
> in the build flag and/or in the gn args?

Just whatever makes the most grammatical sense for what you're doing.

[brettw, 2016-12-13 23:19:29]

No flag change

[brettw, 2016-12-13 23:20:53]

Description was changed from

==========
Convert proprietary_codecs to a buildflag header.

Moves the gn build arg out of //build/config/features.gni to
//media/media_options.gni. Convert the preprocessor define to a buildflag
//header defined in //media.
==========

to

==========
Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert the preprocessor define to a buildflag
//header defined in //media. The build arg is kept in
//build/config/features.gni due to a dependency on WebRTC (described in a
comment).
==========

[brettw, 2016-12-13 23:21:48]

Thanks, I had some problems with the GN variable being used by WebRTC in an
incompatible way. So I reverted the GN variable portion of this but kept all of
the #define stuff (the majority and a strict subset). I added a comment in
features.gni about why it can't be moved easily.

[brettw, 2016-12-13 23:21:54]

The CQ bit was checked by brettw@chromium.org

[brettw, 2016-12-13 23:21:54]

The patchset sent to the CQ was uploaded after l-g-t-m from xhwang@chromium.org
Link to the patchset: https://codereview.chromium.org/2572883002/#ps20001
(title: "No flag change")

[commit-bot: I haz the power, 2016-12-13 23:22:45]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 01:24:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 01:24:24]

Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[brettw, 2016-12-14 01:35:27]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-14 01:36:06]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 04:59:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 04:59:52]

Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[brettw, 2016-12-14 05:17:45]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-14 05:18:00]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 07:56:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 07:56:26]

Failed to apply patch for chrome/common/chrome_content_client.cc:
While running git apply --index -p1;
  error: patch failed: chrome/common/chrome_content_client.cc:43
  error: chrome/common/chrome_content_client.cc: patch does not apply

Patch:       chrome/common/chrome_content_client.cc
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc
b/chrome/common/chrome_content_client.cc
index
20ba8876bd79e7d9d3672156011d40499d53f9f0..7bd1559ec1b5fb2b6582e94c1e41fa0aa7b57071
100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -43,6 +43,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/features/features.h"
 #include "gpu/config/gpu_info.h"
+#include "media/media_features.h"
 #include "net/http/http_util.h"
 #include "ppapi/features/features.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -134,9 +135,9 @@ bool IsWidevineAvailable(base::FilePath* adapter_path,
       // This list must match the CDM that is being bundled with Chrome.
       codecs_supported->push_back(kCdmSupportedCodecVp8);
       codecs_supported->push_back(kCdmSupportedCodecVp9);
-#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
       codecs_supported->push_back(kCdmSupportedCodecAvc1);
-#endif  // defined(USE_PROPRIETARY_CODECS)
+#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
       return true;
     }
   }

[brettw, 2016-12-14 21:04:36]

Merge

[brettw, 2016-12-14 21:04:37]

The CQ bit was checked by brettw@chromium.org

[brettw, 2016-12-14 21:04:41]

The patchset sent to the CQ was uploaded after l-g-t-m from xhwang@chromium.org
Link to the patchset: https://codereview.chromium.org/2572883002/#ps40001
(title: "Merge")

[commit-bot: I haz the power, 2016-12-14 21:05:25]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 23:11:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 23:11:58]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[brettw, 2016-12-15 18:32:38]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-15 18:33:10]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-16 02:50:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-16 02:50:37]

Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[brettw, 2016-12-16 17:29:28]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-16 17:30:06]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[brettw, 2016-12-16 20:19:54]

The CQ bit was unchecked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-16 20:21:00]

Description was changed from

==========
Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert the preprocessor define to a buildflag
//header defined in //media. The build arg is kept in
//build/config/features.gni due to a dependency on WebRTC (described in a
comment).
==========

to

==========
Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert the preprocessor define to a buildflag
//header defined in //media. The build arg is kept in
//build/config/features.gni due to a dependency on WebRTC (described in a
comment).

R=xhwang@chromium.org

Committed: https://crrev.com/866e43b5348172572654dde22dfcf0556fe47d26
Cr-Commit-Position: refs/heads/master@{#439175}
==========

[commit-bot: I haz the power, 2016-12-16 20:21:02]

Patchset 3 (id:??) landed as
https://crrev.com/866e43b5348172572654dde22dfcf0556fe47d26
Cr-Commit-Position: refs/heads/master@{#439175}

[brettw, 2016-12-16 20:22:11]

Description was changed from

==========
Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert the preprocessor define to a buildflag
//header defined in //media. The build arg is kept in
//build/config/features.gni due to a dependency on WebRTC (described in a
comment).

R=xhwang@chromium.org

Committed: https://crrev.com/866e43b5348172572654dde22dfcf0556fe47d26
Cr-Commit-Position: refs/heads/master@{#439175}
==========

to

==========
Convert USE_PROPRIETARY_CODECS to a buildflag header.

Convert the preprocessor define to a buildflag
//header defined in //media. The build arg is kept in
//build/config/features.gni due to a dependency on WebRTC (described in a
comment).

R=xhwang@chromium.org

Committed:
https://chromium.googlesource.com/chromium/src/+/866e43b5348172572654dde22dfc...
==========

[brettw, 2016-12-16 20:22:12]

Committed patchset #3 (id:40001) manually as
866e43b5348172572654dde22dfcf0556fe47d26 (presubmit successful).

[rjkroege, 2016-12-16 22:30:42]

A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.chromium.org/2580093002/ by rjkroege@chromium.org.

The reason for reverting is: best-guess fix for:

/b/c/b/Android_Arm64_Builder__dbg_/src/buildtools/linux64/gn gen //out/Debug
--check
  -> returned 1
ERROR at build arg file (use "gn args <out_dir>" to edit):1:19: Build argument
has no effect.
ffmpeg_branding = "Chrome"
                  ^-------
The variable "ffmpeg_branding" was set as a build argument
but never appeared in a declare_args() block in any buildfile..