Fix build/common.gypi to actually set proprietary_codecs when branding=Chrome.

The 'proprietary_codecs%': 0 declaration was overwriting the conditionally-set statement earlier in the file. Instead, move the 0 assignment into the else branch and copy the conditionally-set variable into the outer scope.

I fail at gyp.

BUG=277948
R=acolwell@chromium.org

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@219379 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -546,6 +546,8 @@
         # proprietary codecs.
         ['OS=="android" or branding=="Chrome"', {
           'proprietary_codecs%': 1,
+        }, {
+          'proprietary_codecs%': 0,
         }],
 
         # Enable autofill dialog for Android, Mac and Views-enabled platforms.
@@ -882,6 +884,7 @@
     'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
     'enable_mdns%' : '<(enable_mdns)',
     'v8_optimized_debug': '<(v8_optimized_debug)',
+    'proprietary_codecs%': '<(proprietary_codecs)',
 
     # Use system nspr instead of the bundled one.
     'use_system_nspr%': 0,
@@ -941,10 +944,6 @@
     # to ~/.gyp/include.gypi, gclient runhooks --force, and do a release build.
     'win_use_allocator_shim%': 1, # 1 = shim allocator via libcmt; 0 = msvcrt
 
-    # Whether proprietary audio/video codecs are assumed to be included with
-    # this build (only meaningful if branding!=Chrome).
-    'proprietary_codecs%': 0,
-
     # TODO(bradnelson): eliminate this when possible.
     # To allow local gyp files to prevent release.vsprops from being included.
     # Yes(1) means include release.vsprops.