gyp: unify toolkit_views usage

third_party/ffmpeg/ffmpeg.gyp

Index: third_party/ffmpeg/ffmpeg.gyp
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 0d661a30a5b578c538ab49f05520bff9231315e0..7f428904d881bdeeb46fac2c8e46f3bf399f22ec 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -39,9 +39,9 @@
     # Allow overridding the selection of which FFmpeg binaries to copy via an
     # environment variable.  Affects the ffmpeg_binaries target.
     'conditions': [
-      ['chromeos!=0 or toolkit_views!=0', {
+      ['chromeos==1', {

[Daniel Erat, 2010/04/27 01:12:25]

Am I misreading this, or does it change the logic?  Did this match e.g. Windows
before?

[Evan Martin, 2010/04/27 01:16:20]

You are right.  But I think it was wrong before.

(That is, with the old we'd call ourselves ChromeOS on a toolkit_views
non-ChromeOS build.)

         'ffmpeg_branding%': '<(branding)OS',
-      },{  # else chromeos==0, assume Chrome/Chromium.
+      }, {  # otherwise, assume Chrome/Chromium.
         'ffmpeg_branding%': '<(branding)',
       }],
       ['armv7==1 and arm_neon==1', {