Convert from using env['PLATFORM'] directly to using the more flexible...

chrome/SConscript

 # Copyright (c) 2006-2008 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.
 
 import os
 
 Import(['env'])
 
 env_res = env.Clone()
 env_test = env.Clone()
 env = env.Clone()
 
 install_targets = []
 grit_files = []
 
 
 env.Prepend(
     CPPPATH = [
         'app',
         '$CHROME_DIR/third_party/wtl/include',
     ],
 )
 
 
 # TODO(port)
-if env_res['PLATFORM'] == 'win32':
+if env_res.Bit('windows'):
   env_res.Append(
       CPPPATH = [
           '.',
           '$CHROME_SRC_DIR',
           # For app/chrome_dll.res to #include installer_util_strings.rc.
           '$CHROME_DIR/installer/util',
       ],
       RCFLAGS = [
           ['/l', '0x409'],
       ],
@@ skipping 95 matching lines @@
         'renderer',
         'hunspell',
         # TODO(sgk):  Windows doesn't use libevent, revisit when Linux gets here
         #'libevent',
         'sqlite',
         'views',
         'v8_snapshot',
     ],
 )
 
-if env_dll['PLATFORM'] == 'win32':
+if env_dll.Bit('windows'):
   env_dll.Append(
       LIBS = [
           # TODO(sgk):  to be ported to Mac and Linux
           'sdch',
 
           #'comctl32.lib',
           #'dwmapi.lib',
           #'rpcrt4.lib',
           #'shlwapi.lib',
           #'winmm.lib',
@@ skipping 30 matching lines @@
           '/ignore:4199',
           '/ignore:4221',
           '/nxcompat',
 
           '/PDB:${TARGETS[1]}',
       ],
   )
 
 input_files = []
 
-if env_dll['PLATFORM'] == 'win32':
+if env_dll.Bit('windows'):
   input_files.extend([
       'app/chrome_dll_main.cc',
       '$V8_DIR/snapshot-empty$OBJSUFFIX',
   ])
 
 
 
 # TODO(sgk): make a pseudo-Builder for these
 import sys
 sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath)
@@ skipping 15 matching lines @@
 
 # NOTE: fake target gets replaced with real targets from reading .grd
 google_chrome = env_grd.GRIT(
     '$TARGET_ROOT/grit_derived_sources/fake_google_chrome_target',
     '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd')
 grit_files.extend(google_chrome)
 
 
 
 # TODO(port)
-if env_dll['PLATFORM'] == 'win32':
+if env_dll.Bit('windows'):
   dll_targets = env_dll.ChromeSharedLibrary('chrome_dll/chrome',
                                             dll_resources + input_files,
                                             PDB='chrome_dll.pdb')
   install_targets.extend(dll_targets)
 
   for g in [ g for g in grit_files if str(g).endswith('.rc') ]:
     env_res.RES(g)
 
   chrome_exe_version_rc = env.ChromeVersionRC(
       'chrome_exe_version.rc',
@@ skipping 53 matching lines @@
         '/dynamicbase',
         '/ignore:4199',
         '/nxcompat',
 
         '/PDB:${TARGETS[1]}',
         #'/IMPLIB:${TARGETS[2]}',
     ],
 )
 
 # TODO(port)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   chrome_exe = env_exe.ChromeProgram(
       'chrome_exe/chrome',
       [
           chrome_exe_res,
           'app/breakpad.cc',
           'app/chrome_exe_main.cc',
           'app/client_util.cc',
           'app/google_update_client.cc',
       ]
   )
@@ skipping 45 matching lines @@
     'browser/resources/history.html',
     'browser/resources/incognito_tab.html',
     'browser/resources/new_tab.html',
     'browser/resources/safe_browsing_malware_block.html',
     'browser/resources/safe_browsing_phishing_block.html',
     'browser/security/resources/ssl_error.html',
     'browser/security/resources/ssl_roadblock.html',
 ]
 
 # TODO(port)
-if env_flat['PLATFORM'] == 'win32':
+if env_flat.Bit('windows'):
   flats_out = []
   for i in flats:
     flats_out.extend(env_flat.FlatHtml(i))
 
   # TODO(sgk):  Remove when we upgrade to SCons 1.1.0, which
   # determines implicit dependencies from .rc files.
   env_flat.Depends(browser_res, flats_out)
 
 sconscript_files = []
 
 if not env.WantSystemLib('hunspell'):
   sconscript_files.append('third_party/hunspell/SConscript')
 if not env.WantSystemLib('sqlite'):
   sconscript_files.append('$THIRD_PARTY_DIR/sqlite/SConscript')
 
 # TODO(port)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   sconscript_files.extend([
       'app/resources/SConscript',
       'app/theme/SConscript',
       'browser/views/SConscript',
       'views/SConscript',
   ])
 
 env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test'])
 
 # TODO(port)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.InstallAs('$LIBS_DIR/${LIBPREFIX}jscre${LIBSUFFIX}',
                 '$WEBKIT_DIR/JavaScriptCore_pcre.lib')
 
 
 env.Install('$DESTINATION_ROOT', install_targets)
 
 
 gears_plugins = [
     '$GEARS_DIR/binaries/gears.dll',
     '$GEARS_DIR/binaries/gears.pdb',
 ]
 
 # TODO(port)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins)
 
 env.Command('$DESTINATION_ROOT/resources/inspector',
             '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end',
             Copy('$TARGET', '$SOURCE'),
             source_scanner=DirScanner)