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

and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
  other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 8 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 840013f..587da3c 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -30,7 +30,7 @@ env.Prepend(
     ],
 )
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   env.Prepend(
       CPPPATH = [
           '$CHROME_DIR/tools/build/win',
@@ -39,7 +39,7 @@ if env['PLATFORM'] == 'win32':
 
 input_files = []
 
-if env['PLATFORM'] in ('posix', 'win32'):
+if not env.Bit('mac'):
   # TODO: Port to Mac.
   input_files.extend([
       'autocomplete/keyword_provider.cc',
@@ -117,7 +117,7 @@ if env['PLATFORM'] in ('posix', 'win32'):
       'webdata/web_database.cc',
   ])
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   # TODO: Port these.
   input_files.extend([
       'autofill_manager.cc',
@@ -300,11 +300,11 @@ if env['PLATFORM'] == 'win32':
       'web_contents_view_win.cc',
   ])
 
-if env['PLATFORM'] in ('darwin', 'posix'):
+if env.Bit('posix'):
   input_files.extend([
       'importer/firefox_profile_lock_posix.cc',
   ])
 
-if env['PLATFORM'] in ('posix', 'win32'):
+if not env.Bit('mac'):
   # TODO: This should work for all platforms.
   env.ChromeStaticLibrary('browser', input_files)
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index 7dce9b4..2846f89 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -36,7 +36,7 @@ input_files = [
     'debugger_wrapper.cc',
 ]
 
-if env['PLATFORM'] != 'win32':
+if env.Bit('linux'):
   # TODO(port): Port these.
   remove_list = [
       'debugger_contents.cc',
@@ -49,7 +49,20 @@ if env['PLATFORM'] != 'win32':
   for file in remove_list:
     input_files.remove(file)
 
-if env['PLATFORM'] in ('posix', 'win32'):
+if env.Bit('mac'):
+  # TODO(port): Port these.
+  remove_list = [
+      'debugger_contents.cc',
+      'debugger_host_impl.cpp',
+      'debugger_node.cc',
+      'debugger_shell.cc',
+      'debugger_view.cc',
+      'debugger_window.cc',
+  ]
+  for file in remove_list:
+    input_files.remove(file)
+
+if not env.Bit('mac'):
   # TODO(port): Enable for Mac.
   env.ChromeStaticLibrary('debugger', input_files)
 
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index a0dcb2d..4c0e9c4 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -132,7 +132,7 @@ input_files = [
     'user_data_dir_dialog.cc',
 ]
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   input_files.extend([
       'find_bar_win.cc',
   ])