Expand the workaround in r149575 to cover more builders.

chrome/chrome_tests.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 2265 matching lines @@
             'browser/password_manager/native_backend_gnome_x_unittest.cc',
           ],
         }],
         ['OS=="linux" and use_aura==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus_test_support',
             '../ui/aura/aura.gyp:test_support_aura',
           ],
         }],
-        ['OS=="linux" and buildtype=="Official" and target_arch=="ia32"', {
+        ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', {
           'configurations': {
             'Release': {
               'ldflags': [
                 '-Wl,--strip-debug',
               ],
             },
           },
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
@@ skipping 2374 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }