59 files changed, 8042 insertions, 8042 deletions
diff --git a/breakpad/SConscript b/breakpad/SConscript
index 77a2831..3ff468f 100644
--- a/breakpad/SConscript
+++ b/breakpad/SConscript
@@ -1,74 +1,74 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        'src',
-        '#/..',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TP',
-          '/wd4800',
-      ],
-  )
-
-  sender_input_files = [
-      'src/client/windows/sender/crash_report_sender.cc',
-      'src/common/windows/http_upload.cc',
-  ]
-
-  env.ChromeStaticLibrary('breakpad_sender', sender_input_files)
-
-
-if env['PLATFORM'] == 'win32':
-  handler_input_files = [
-      'src/client/windows/crash_generation/client_info.cc',
-      'src/client/windows/crash_generation/minidump_generator.cc',
-      'src/common/windows/guid_string.cc',
-      'src/client/windows/handler/exception_handler.cc',
-      'src/client/windows/crash_generation/crash_generation_server.cc',
-      'src/client/windows/crash_generation/crash_generation_client.cc',
-  ]
-elif env['PLATFORM'] == 'posix':
-  handler_input_files = [
-      'src/common/linux/guid_creator.cc',
-      'src/client/linux/handler/exception_handler.cc',
-      'src/client/linux/handler/minidump_generator.cc',
-      'src/client/linux/handler/linux_thread.cc',
-  ]
-
-env.ChromeStaticLibrary('breakpad_handler', handler_input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        'src',
+        '#/..',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TP',
+          '/wd4800',
+      ],
+  )
+
+  sender_input_files = [
+      'src/client/windows/sender/crash_report_sender.cc',
+      'src/common/windows/http_upload.cc',
+  ]
+
+  env.ChromeStaticLibrary('breakpad_sender', sender_input_files)
+
+
+if env['PLATFORM'] == 'win32':
+  handler_input_files = [
+      'src/client/windows/crash_generation/client_info.cc',
+      'src/client/windows/crash_generation/minidump_generator.cc',
+      'src/common/windows/guid_string.cc',
+      'src/client/windows/handler/exception_handler.cc',
+      'src/client/windows/crash_generation/crash_generation_server.cc',
+      'src/client/windows/crash_generation/crash_generation_client.cc',
+  ]
+elif env['PLATFORM'] == 'posix':
+  handler_input_files = [
+      'src/common/linux/guid_creator.cc',
+      'src/client/linux/handler/exception_handler.cc',
+      'src/client/linux/handler/minidump_generator.cc',
+      'src/client/linux/handler/linux_thread.cc',
+  ]
+
+env.ChromeStaticLibrary('breakpad_handler', handler_input_files)
diff --git a/chrome/SConscript b/chrome/SConscript
index 56408b4..3acbd63 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -1,460 +1,460 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import os
-
-Import(['env'])
-
-env_res = env.Clone()
-env_test = env.Clone()
-env = env.Clone()
-
-install_targets = []
-
-
-env.Prepend(
-    CPPPATH = [
-        'app',
-        '$CHROME_DIR/third_party/wtl/include',
-    ],
-)
-
-
-env_res.Append(
-    CPPPATH = [
-        '.',
-        '#/..',
-    ],
-    RCFLAGS = [
-        ['/l', '0x409'],
-    ],
-)
-
-browser_res = env_res.RES('browser/browser_resources.rc')
-chrome_dll_res = env_res.RES('app/chrome_dll.rc')
-common_res = env_res.RES('common/common_resources.rc')
-debugger_res = env_res.RES('browser/debugger/resources/debugger_resources.rc')
-renderer_res = env_res.RES('renderer/renderer_resources.rc')
-test_data_res = env_res.RES('test/data/resource.rc')
-webkit_res = env_res.RES('$WEBKIT_DIR/glue/webkit_resources.rc')
-
-net_res = '$NET_DIR/net_resources.res'
-
-dll_resources = [
-    browser_res,
-    chrome_dll_res,
-    common_res,
-    debugger_res,
-    net_res,
-    renderer_res,
-    webkit_res,
-]
-
-env_test['BROWSER_RES'] = browser_res[0]
-env_test['TEST_DATA_RES'] = test_data_res[0]
-
-env_dll = env.Clone()
-
-env_dll.Prepend(
-    CPPPATH = [
-        "..",
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-        'LIBXSLT_STATIC',
-        'LIBXML_STATIC',
-        '_WINDLL',
-        'BROWSER_DLL',
-        'RENDERER_DLL',
-        'PLUGIN_DLL',
-    ],
-    CCFLAGS = [
-        '/TP',
-        '/Wp64',
-    ],
-)
-
-env_dll.Append(
-    CPPPATH = [
-        '$CHROME_DIR/app',
-        '$LIBPNG_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBXSL_DIR',
-        '$LIBXML_DIR/include',
-        '$BREAKPAD_DIR/src',
-    ],
-    LIBS = [
-        'base',
-        'base_gfx',
-        'breakpad_handler',
-        'googleurl',
-        'net',
-        'skia',
-        'bzip2',
-        'icuuc',
-        'libjpeg',
-        'libpng',
-        'libxml',
-        'libxslt',
-        'modp_b64',
-        'zlib',
-
-        'activex_shim',
-        'WTF',
-        'V8Bindings',
-        'WebCore',
-        'default_plugin',
-        'Glue',
-        'JavaScriptCore_pcre',
-        'Port',
-    ],
-)
-
-env_dll.Append(
-    LIBS = [
-        'comctl32.lib',
-        'dwmapi.lib',
-        'rpcrt4.lib',
-        'shlwapi.lib',
-        'winmm.lib',
-        'wsock32.lib',
-    ],
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"comdlg32.dll"',
-        '/DELAYLOAD:"crypt32.dll"',
-        '/DELAYLOAD:"cryptui.dll"',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"imagehlp.dll"',
-        '/DELAYLOAD:"imm32.dll"',
-        '/DELAYLOAD:"oleacc.dll"',
-        '/DELAYLOAD:"oleaut32.dll"',
-        '/DELAYLOAD:"psapi.dll"',
-        '/DELAYLOAD:"urlmon.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/DELAYLOAD:"winhttp.dll"',
-        '/DELAYLOAD:"wininet.dll"',
-        '/DELAYLOAD:"winspool.drv"',
-        '/DELAYLOAD:"ws2_32.dll"',
-        '/DELAYLOAD:"wsock32.dll"',
-
-        '/SUBSYSTEM:WINDOWS',
-        '/BASE:"0x01000000"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/PDB:${TARGETS[1]}',
-        '/IMPLIB:${TARGETS[2]}',
-    ],
-)
-
-input_files = [
-    'app/chrome_dll_main.cc',
-]
-
-libs = [
-    'browser/browser.lib',
-    'browser/views/browser_views.lib',
-    'browser/debugger/debugger.lib',
-    'common/common.lib',
-    'installer/util/util.lib',
-    'libjscre.lib',
-    'plugin/plugin.lib',
-    'renderer/renderer.lib',
-    'third_party/hunspell/hunspell.lib',
-    'third_party/sqlite/sqlite.lib',
-    'views/views.lib',
-    '$V8_DIR/v8.lib',
-    '$V8_DIR/snapshot-empty.obj',
-]
-
-dll_targets = env_dll.ChromeSharedLibrary(['chrome',
-                                     'chrome_dll.pdb',
-                                     'chrome_dll.lib'],
-                                    dll_resources + input_files + libs)
-
-install_targets.extend(dll_targets)
-
-
-
-import os
-import sys
-sys.path.append(Dir('#/../tools/grit').abspath)
-env_grd = env.Clone()
-env_grd.Tool('scons', toolpath=['#/../tools/grit/grit'])
-# NOTE: generated_target is fake, to cause a different target.
-generated = env_grd.GRIT('app/resources/generated_target',
-                         '#/../chrome/app/generated_resources.grd')
-for g in [ g for g in generated if str(g).endswith('.rc') ]:
-    env_res.RES(g)
-
-
-
-def chrome_version_emitter(target, source, env):
-    source.append('$CHROME_SRC_DIR/VERSION')
-    source.append('$CHROME_SRC_DIR/BRANDING')
-    return target, source
-
-b = Builder(action = '$CHROME_VERSION_RC_COM',
-            emitter = chrome_version_emitter)
-
-env['BUILDERS']['ChromeVersionRC'] = b
-
-env.Replace(
-    CHROME_VERSION_RC_COM = '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET',
-    VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),
-    CHROME_SRC_DIR = Dir('#/../chrome'),
-    PWD = Dir('.'),
-)
-
-chrome_exe_version_rc = env.ChromeVersionRC(
-    'chrome_exe_version.rc',
-    'app/chrome_exe_version.rc.version'
-)
-
-chrome_dll_version_rc = env.ChromeVersionRC(
-    'chrome_dll_version.rc',
-    'app/chrome_dll_version.rc.version',
-)
-
-Depends(chrome_dll_res, chrome_dll_version_rc)
-
-chrome_exe_version_res = env_res.RES(chrome_exe_version_rc)
-chrome_dll_version_res = env_res.RES(chrome_dll_version_rc)
-
-install_targets.extend(chrome_exe_version_rc)
-install_targets.extend(chrome_exe_version_res)
-
-install_targets.extend(chrome_dll_version_rc)
-install_targets.extend(chrome_dll_version_res)
-
-
-
-env_exe = env.Clone()
-
-env_exe.Prepend(
-    CPPPATH = [
-        '..',
-        '$BREAKPAD_DIR/src',
-    ],
-    LIBS = [
-        'breakpad_handler',
-        'sandbox',
-        'base',
-        'icuuc',
-    ],
-)
-
-env_exe.Append(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/SUBSYSTEM:WINDOWS',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/PDB:${TARGETS[1]}',
-        '/IMPLIB:${TARGETS[2]}',
-    ],
-)
-
-chrome_exe = env_exe.ChromeProgram(
-    ['chrome.exe',
-     'chrome_exe.pdb',
-     'chrome_exe_implib.lib'],
-    [
-        env_res.RES('app/chrome_exe.rc'),
-        'app/breakpad.cc',
-        'app/chrome_exe_main.cc',
-        'app/google_update_client.cc',
-        'app/google_update_settings.cc',
-
-        'common/common.lib',
-        '$CHROME_DIR/chrome_dll.lib',
-    ]
-)
-
-install_targets.extend(chrome_exe)
-env.Requires(chrome_exe[0], ['$TARGET_ROOT/chrome.dll',
-                             '$TARGET_ROOT/icudt38.dll',
-                             '$TARGET_ROOT/rlz.dll',
-                             '$TARGET_ROOT/First Run'])
-
-env.Command('$TARGET_ROOT/First Run', '$CHROME_DIR/app/FirstRun',
-            Copy('$TARGET', '$SOURCE'))
-
-# For release we want to run dependencies.py, may look something like:
-#env.AddPostAction('$TARGET_ROOT/chrome.exe',
-#                  '$PYTHON tools/build/win/dependencies.py $(TargetPath) chrome.exe.deps')
-
-
-env_snapshot = env.Clone()
-
-env_snapshot.Prepend(
-    CPPPATH = [
-        '$V8_DIR/src',
-        '$V8_DIR/src/pcre/jscre',
-        '..',
-    ],
-    CPPDEFINES = [
-        'ENABLE_DISASSEMBLER',
-    ],
-    CCFLAGS = [
-        '/wd4099',
-        '/wd4355',
-        '/wd4800',
-    ],
-)
-
-env_snapshot.ChromeStaticLibrary('snapshotv8', 'snapshot.cc')
-
-env_snapshot.Command('snapshot.cc', '#/../v8/bin/debug/mksnapshot.exe',
-                     '$SOURCE $TARGET')
-
-
-
-env_flat = env.Clone(
-    BROWSER_RESOURCES = Dir('browser_resources'),
-    HTML_INLINE = File('#/../chrome/tools/build/win/html_inline.py'),
-    FLATTEN_HTML_COM = '$PYTHON $HTML_INLINE $SOURCE $TARGET',
-)
-
-flats = [
-    'about_memory',
-    'about_version',
-    'incognito_tab',
-    'new_tab',
-    'safe_browsing_malware_block',
-    'safe_browsing_phishing_block',
-    'ssl_error',
-]
-
-flats_out = []
-for i in flats:
-  flats_out += env_flat.Command(
-      '$BROWSER_RESOURCES/' + i + '_flat.html',
-      'browser/resources/' + i + '.html', '$FLATTEN_HTML_COM')
-
-flats_out += env_flat.Command(
-    '$BROWSER_RESOURCES/ssl_roadblock_flat.html',
-    'browser/security/resources/ssl_roadblock.html', '$FLATTEN_HTML_COM')
-
-env_flat.Depends(browser_res, flats_out)
-
-
-
-env_test.Object('test/test_file_util.cc',
-                CPPPATH=['..'] + env['CPPPATH'])
-
-test_sconscript_files = [
-    'SConscript.automated_ui_tests',
-    'SConscript.unit_tests',
-    'SConscript.ui_tests',
-]
-
-env.SConscript(test_sconscript_files, exports=['env_test'])
-
-
-sconscript_files = [
-    'app/resources/SConscript',
-    'app/theme/SConscript',
-    'browser/SConscript',
-    'browser/views/SConscript',
-    'common/SConscript',
-    'installer/mini_installer/SConscript',
-    'installer/setup/SConscript',
-    'installer/util/SConscript',
-    'plugin/SConscript',
-    'renderer/SConscript',
-    'test/activex_test_control/SConscript',
-    'test/automation/SConscript',
-    'test/chrome_plugin/SConscript',
-    'test/interactive_ui/SConscript',
-    'test/memory_test/SConscript',
-    'test/mini_installer_test/SConscript',
-    'test/page_cycler/SConscript',
-    'test/plugin/SConscript',
-    'test/reliability/SConscript',
-    'test/security_tests/SConscript',
-    'test/selenium/SConscript',
-    'test/startup/SConscript',
-    'test/tab_switching/SConscript',
-    'tools/crash_service/SConscript',
-    'tools/perf/flush_cache/SConscript',
-    'tools/test/image_diff/SConscript',
-    'third_party/hunspell/SConscript',
-    'third_party/sqlite/SConscript',
-    'views/SConscript',
-]
-
-env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test'])
-
-
-env.InstallAs('libjscre.lib', '$WEBKIT_DIR/JavaScriptCore_pcre.lib')
-
-
-i = env.Install('$TARGET_ROOT', install_targets)
-env.Alias('chrome', i)
-
-
-gears_plugins = [
-    '$GEARS_DIR/binaries/gears.dll',
-    '$GEARS_DIR/binaries/gears.pdb',
-]
-
-i = env.Install('$TARGET_ROOT/plugins/gears', gears_plugins)
-env.Alias('chrome', i)
-
-
-i = env.Command('$TARGET_ROOT/resources/inspector',
-            '#/../webkit/port/page/inspector',
-            Copy('$TARGET', '$SOURCE'),
-            source_scanner=DirScanner)
-env.Alias('chrome', i)
-
-env.Alias('chrome', env.Alias('webkit'))
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os
+
+Import(['env'])
+
+env_res = env.Clone()
+env_test = env.Clone()
+env = env.Clone()
+
+install_targets = []
+
+
+env.Prepend(
+    CPPPATH = [
+        'app',
+        '$CHROME_DIR/third_party/wtl/include',
+    ],
+)
+
+
+env_res.Append(
+    CPPPATH = [
+        '.',
+        '#/..',
+    ],
+    RCFLAGS = [
+        ['/l', '0x409'],
+    ],
+)
+
+browser_res = env_res.RES('browser/browser_resources.rc')
+chrome_dll_res = env_res.RES('app/chrome_dll.rc')
+common_res = env_res.RES('common/common_resources.rc')
+debugger_res = env_res.RES('browser/debugger/resources/debugger_resources.rc')
+renderer_res = env_res.RES('renderer/renderer_resources.rc')
+test_data_res = env_res.RES('test/data/resource.rc')
+webkit_res = env_res.RES('$WEBKIT_DIR/glue/webkit_resources.rc')
+
+net_res = '$NET_DIR/net_resources.res'
+
+dll_resources = [
+    browser_res,
+    chrome_dll_res,
+    common_res,
+    debugger_res,
+    net_res,
+    renderer_res,
+    webkit_res,
+]
+
+env_test['BROWSER_RES'] = browser_res[0]
+env_test['TEST_DATA_RES'] = test_data_res[0]
+
+env_dll = env.Clone()
+
+env_dll.Prepend(
+    CPPPATH = [
+        "..",
+    ],
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+        'LIBXSLT_STATIC',
+        'LIBXML_STATIC',
+        '_WINDLL',
+        'BROWSER_DLL',
+        'RENDERER_DLL',
+        'PLUGIN_DLL',
+    ],
+    CCFLAGS = [
+        '/TP',
+        '/Wp64',
+    ],
+)
+
+env_dll.Append(
+    CPPPATH = [
+        '$CHROME_DIR/app',
+        '$LIBPNG_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$LIBXSL_DIR',
+        '$LIBXML_DIR/include',
+        '$BREAKPAD_DIR/src',
+    ],
+    LIBS = [
+        'base',
+        'base_gfx',
+        'breakpad_handler',
+        'googleurl',
+        'net',
+        'skia',
+        'bzip2',
+        'icuuc',
+        'libjpeg',
+        'libpng',
+        'libxml',
+        'libxslt',
+        'modp_b64',
+        'zlib',
+
+        'activex_shim',
+        'WTF',
+        'V8Bindings',
+        'WebCore',
+        'default_plugin',
+        'Glue',
+        'JavaScriptCore_pcre',
+        'Port',
+    ],
+)
+
+env_dll.Append(
+    LIBS = [
+        'comctl32.lib',
+        'dwmapi.lib',
+        'rpcrt4.lib',
+        'shlwapi.lib',
+        'winmm.lib',
+        'wsock32.lib',
+    ],
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"comdlg32.dll"',
+        '/DELAYLOAD:"crypt32.dll"',
+        '/DELAYLOAD:"cryptui.dll"',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"imagehlp.dll"',
+        '/DELAYLOAD:"imm32.dll"',
+        '/DELAYLOAD:"oleacc.dll"',
+        '/DELAYLOAD:"oleaut32.dll"',
+        '/DELAYLOAD:"psapi.dll"',
+        '/DELAYLOAD:"urlmon.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/DELAYLOAD:"winhttp.dll"',
+        '/DELAYLOAD:"wininet.dll"',
+        '/DELAYLOAD:"winspool.drv"',
+        '/DELAYLOAD:"ws2_32.dll"',
+        '/DELAYLOAD:"wsock32.dll"',
+
+        '/SUBSYSTEM:WINDOWS',
+        '/BASE:"0x01000000"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/PDB:${TARGETS[1]}',
+        '/IMPLIB:${TARGETS[2]}',
+    ],
+)
+
+input_files = [
+    'app/chrome_dll_main.cc',
+]
+
+libs = [
+    'browser/browser.lib',
+    'browser/views/browser_views.lib',
+    'browser/debugger/debugger.lib',
+    'common/common.lib',
+    'installer/util/util.lib',
+    'libjscre.lib',
+    'plugin/plugin.lib',
+    'renderer/renderer.lib',
+    'third_party/hunspell/hunspell.lib',
+    'third_party/sqlite/sqlite.lib',
+    'views/views.lib',
+    '$V8_DIR/v8.lib',
+    '$V8_DIR/snapshot-empty.obj',
+]
+
+dll_targets = env_dll.ChromeSharedLibrary(['chrome',
+                                     'chrome_dll.pdb',
+                                     'chrome_dll.lib'],
+                                    dll_resources + input_files + libs)
+
+install_targets.extend(dll_targets)
+
+
+
+import os
+import sys
+sys.path.append(Dir('#/../tools/grit').abspath)
+env_grd = env.Clone()
+env_grd.Tool('scons', toolpath=['#/../tools/grit/grit'])
+# NOTE: generated_target is fake, to cause a different target.
+generated = env_grd.GRIT('app/resources/generated_target',
+                         '#/../chrome/app/generated_resources.grd')
+for g in [ g for g in generated if str(g).endswith('.rc') ]:
+    env_res.RES(g)
+
+
+
+def chrome_version_emitter(target, source, env):
+    source.append('$CHROME_SRC_DIR/VERSION')
+    source.append('$CHROME_SRC_DIR/BRANDING')
+    return target, source
+
+b = Builder(action = '$CHROME_VERSION_RC_COM',
+            emitter = chrome_version_emitter)
+
+env['BUILDERS']['ChromeVersionRC'] = b
+
+env.Replace(
+    CHROME_VERSION_RC_COM = '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET',
+    VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),
+    CHROME_SRC_DIR = Dir('#/../chrome'),
+    PWD = Dir('.'),
+)
+
+chrome_exe_version_rc = env.ChromeVersionRC(
+    'chrome_exe_version.rc',
+    'app/chrome_exe_version.rc.version'
+)
+
+chrome_dll_version_rc = env.ChromeVersionRC(
+    'chrome_dll_version.rc',
+    'app/chrome_dll_version.rc.version',
+)
+
+Depends(chrome_dll_res, chrome_dll_version_rc)
+
+chrome_exe_version_res = env_res.RES(chrome_exe_version_rc)
+chrome_dll_version_res = env_res.RES(chrome_dll_version_rc)
+
+install_targets.extend(chrome_exe_version_rc)
+install_targets.extend(chrome_exe_version_res)
+
+install_targets.extend(chrome_dll_version_rc)
+install_targets.extend(chrome_dll_version_res)
+
+
+
+env_exe = env.Clone()
+
+env_exe.Prepend(
+    CPPPATH = [
+        '..',
+        '$BREAKPAD_DIR/src',
+    ],
+    LIBS = [
+        'breakpad_handler',
+        'sandbox',
+        'base',
+        'icuuc',
+    ],
+)
+
+env_exe.Append(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/SUBSYSTEM:WINDOWS',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/PDB:${TARGETS[1]}',
+        '/IMPLIB:${TARGETS[2]}',
+    ],
+)
+
+chrome_exe = env_exe.ChromeProgram(
+    ['chrome.exe',
+     'chrome_exe.pdb',
+     'chrome_exe_implib.lib'],
+    [
+        env_res.RES('app/chrome_exe.rc'),
+        'app/breakpad.cc',
+        'app/chrome_exe_main.cc',
+        'app/google_update_client.cc',
+        'app/google_update_settings.cc',
+
+        'common/common.lib',
+        '$CHROME_DIR/chrome_dll.lib',
+    ]
+)
+
+install_targets.extend(chrome_exe)
+env.Requires(chrome_exe[0], ['$TARGET_ROOT/chrome.dll',
+                             '$TARGET_ROOT/icudt38.dll',
+                             '$TARGET_ROOT/rlz.dll',
+                             '$TARGET_ROOT/First Run'])
+
+env.Command('$TARGET_ROOT/First Run', '$CHROME_DIR/app/FirstRun',
+            Copy('$TARGET', '$SOURCE'))
+
+# For release we want to run dependencies.py, may look something like:
+#env.AddPostAction('$TARGET_ROOT/chrome.exe',
+#                  '$PYTHON tools/build/win/dependencies.py $(TargetPath) chrome.exe.deps')
+
+
+env_snapshot = env.Clone()
+
+env_snapshot.Prepend(
+    CPPPATH = [
+        '$V8_DIR/src',
+        '$V8_DIR/src/pcre/jscre',
+        '..',
+    ],
+    CPPDEFINES = [
+        'ENABLE_DISASSEMBLER',
+    ],
+    CCFLAGS = [
+        '/wd4099',
+        '/wd4355',
+        '/wd4800',
+    ],
+)
+
+env_snapshot.ChromeStaticLibrary('snapshotv8', 'snapshot.cc')
+
+env_snapshot.Command('snapshot.cc', '#/../v8/bin/debug/mksnapshot.exe',
+                     '$SOURCE $TARGET')
+
+
+
+env_flat = env.Clone(
+    BROWSER_RESOURCES = Dir('browser_resources'),
+    HTML_INLINE = File('#/../chrome/tools/build/win/html_inline.py'),
+    FLATTEN_HTML_COM = '$PYTHON $HTML_INLINE $SOURCE $TARGET',
+)
+
+flats = [
+    'about_memory',
+    'about_version',
+    'incognito_tab',
+    'new_tab',
+    'safe_browsing_malware_block',
+    'safe_browsing_phishing_block',
+    'ssl_error',
+]
+
+flats_out = []
+for i in flats:
+  flats_out += env_flat.Command(
+      '$BROWSER_RESOURCES/' + i + '_flat.html',
+      'browser/resources/' + i + '.html', '$FLATTEN_HTML_COM')
+
+flats_out += env_flat.Command(
+    '$BROWSER_RESOURCES/ssl_roadblock_flat.html',
+    'browser/security/resources/ssl_roadblock.html', '$FLATTEN_HTML_COM')
+
+env_flat.Depends(browser_res, flats_out)
+
+
+
+env_test.Object('test/test_file_util.cc',
+                CPPPATH=['..'] + env['CPPPATH'])
+
+test_sconscript_files = [
+    'SConscript.automated_ui_tests',
+    'SConscript.unit_tests',
+    'SConscript.ui_tests',
+]
+
+env.SConscript(test_sconscript_files, exports=['env_test'])
+
+
+sconscript_files = [
+    'app/resources/SConscript',
+    'app/theme/SConscript',
+    'browser/SConscript',
+    'browser/views/SConscript',
+    'common/SConscript',
+    'installer/mini_installer/SConscript',
+    'installer/setup/SConscript',
+    'installer/util/SConscript',
+    'plugin/SConscript',
+    'renderer/SConscript',
+    'test/activex_test_control/SConscript',
+    'test/automation/SConscript',
+    'test/chrome_plugin/SConscript',
+    'test/interactive_ui/SConscript',
+    'test/memory_test/SConscript',
+    'test/mini_installer_test/SConscript',
+    'test/page_cycler/SConscript',
+    'test/plugin/SConscript',
+    'test/reliability/SConscript',
+    'test/security_tests/SConscript',
+    'test/selenium/SConscript',
+    'test/startup/SConscript',
+    'test/tab_switching/SConscript',
+    'tools/crash_service/SConscript',
+    'tools/perf/flush_cache/SConscript',
+    'tools/test/image_diff/SConscript',
+    'third_party/hunspell/SConscript',
+    'third_party/sqlite/SConscript',
+    'views/SConscript',
+]
+
+env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test'])
+
+
+env.InstallAs('libjscre.lib', '$WEBKIT_DIR/JavaScriptCore_pcre.lib')
+
+
+i = env.Install('$TARGET_ROOT', install_targets)
+env.Alias('chrome', i)
+
+
+gears_plugins = [
+    '$GEARS_DIR/binaries/gears.dll',
+    '$GEARS_DIR/binaries/gears.pdb',
+]
+
+i = env.Install('$TARGET_ROOT/plugins/gears', gears_plugins)
+env.Alias('chrome', i)
+
+
+i = env.Command('$TARGET_ROOT/resources/inspector',
+            '#/../webkit/port/page/inspector',
+            Copy('$TARGET', '$SOURCE'),
+            source_scanner=DirScanner)
+env.Alias('chrome', i)
+
+env.Alias('chrome', env.Alias('webkit'))
diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript
index 501bd60..d390f36 100644
--- a/chrome/app/resources/SConscript
+++ b/chrome/app/resources/SConscript
@@ -1,141 +1,141 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import(['env', 'env_res'])
-
-env = env.Clone()
-env_res = env_res.Clone()
-
-env_res.Append(
-    CPPPATH = [
-        '.',
-        '#/../chrome/Debug/obj/chrome_dll',
-        '#/..',
-        '#/../chrome/Debug/obj',
-    ],
-    RCFLAGS = [
-        ['/l', '0x409'],
-    ],
-)
-
-rc_files = [
-    'locale_settings_ar.rc',
-    'locale_settings_bg.rc',
-    'locale_settings_ca.rc',
-    'locale_settings_cs.rc',
-    'locale_settings_da.rc',
-    'locale_settings_de.rc',
-    'locale_settings_el.rc',
-    'locale_settings_en-GB.rc',
-    'locale_settings_en-US.rc',
-    'locale_settings_es-419.rc',
-    'locale_settings_es.rc',
-    'locale_settings_et.rc',
-    'locale_settings_fi.rc',
-    'locale_settings_fil.rc',
-    'locale_settings_fr.rc',
-    'locale_settings_he.rc',
-    'locale_settings_hi.rc',
-    'locale_settings_hr.rc',
-    'locale_settings_hu.rc',
-    'locale_settings_id.rc',
-    'locale_settings_it.rc',
-    'locale_settings_ja.rc',
-    'locale_settings_ko.rc',
-    'locale_settings_lt.rc',
-    'locale_settings_lv.rc',
-    'locale_settings_nb.rc',
-    'locale_settings_nl.rc',
-    'locale_settings_pl.rc',
-    'locale_settings_pt-BR.rc',
-    'locale_settings_pt-PT.rc',
-    'locale_settings_ro.rc',
-    'locale_settings_ru.rc',
-    'locale_settings_sk.rc',
-    'locale_settings_sl.rc',
-    'locale_settings_sr.rc',
-    'locale_settings_sv.rc',
-    'locale_settings_th.rc',
-    'locale_settings_tr.rc',
-    'locale_settings_uk.rc',
-    'locale_settings_vi.rc',
-    'locale_settings_zh-CN.rc',
-    'locale_settings_zh-TW.rc',
-]
-
-
-resources = []
-for rc in rc_files:
-  resources.extend(env_res.RES(rc))
-
-
-env.Append(
-    LINKFLAGS = [
-        '/INCREMENTAL:NO',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/NOENTRY',
-        '/BASE:"0x3CF00000"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    PDB = '${TARGET}.pdb',
-    no_import_lib = True,       # We don't need the .lib and .exp.
-)
-
-import re
-extract_lang = re.compile(r'locale_settings_(.*)\.res')
-
-locale_dlls = []
-
-for locale_settings_res in resources:
-  s = str(locale_settings_res)
-  #lang = '$CHROME_DIR/locales/' + extract_lang.match(s).group(1)
-  lang = extract_lang.match(s).group(1)
-  g_r_res = s.replace('locale_settings', 'generated_resources')
-  w_s_res = s.replace('locale_settings',
-                      '$WEBKIT_DIR/build/localized_strings/webkit_strings')
-  dll = env.ChromeSharedLibrary(
-      lang,
-      [
-          g_r_res,
-          w_s_res,
-          locale_settings_res,
-      ])
-
-  locale_dlls.append(dll)
-
-i = env.Install('$TARGET_ROOT/locales/', locale_dlls)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import(['env', 'env_res'])
+
+env = env.Clone()
+env_res = env_res.Clone()
+
+env_res.Append(
+    CPPPATH = [
+        '.',
+        '#/../chrome/Debug/obj/chrome_dll',
+        '#/..',
+        '#/../chrome/Debug/obj',
+    ],
+    RCFLAGS = [
+        ['/l', '0x409'],
+    ],
+)
+
+rc_files = [
+    'locale_settings_ar.rc',
+    'locale_settings_bg.rc',
+    'locale_settings_ca.rc',
+    'locale_settings_cs.rc',
+    'locale_settings_da.rc',
+    'locale_settings_de.rc',
+    'locale_settings_el.rc',
+    'locale_settings_en-GB.rc',
+    'locale_settings_en-US.rc',
+    'locale_settings_es-419.rc',
+    'locale_settings_es.rc',
+    'locale_settings_et.rc',
+    'locale_settings_fi.rc',
+    'locale_settings_fil.rc',
+    'locale_settings_fr.rc',
+    'locale_settings_he.rc',
+    'locale_settings_hi.rc',
+    'locale_settings_hr.rc',
+    'locale_settings_hu.rc',
+    'locale_settings_id.rc',
+    'locale_settings_it.rc',
+    'locale_settings_ja.rc',
+    'locale_settings_ko.rc',
+    'locale_settings_lt.rc',
+    'locale_settings_lv.rc',
+    'locale_settings_nb.rc',
+    'locale_settings_nl.rc',
+    'locale_settings_pl.rc',
+    'locale_settings_pt-BR.rc',
+    'locale_settings_pt-PT.rc',
+    'locale_settings_ro.rc',
+    'locale_settings_ru.rc',
+    'locale_settings_sk.rc',
+    'locale_settings_sl.rc',
+    'locale_settings_sr.rc',
+    'locale_settings_sv.rc',
+    'locale_settings_th.rc',
+    'locale_settings_tr.rc',
+    'locale_settings_uk.rc',
+    'locale_settings_vi.rc',
+    'locale_settings_zh-CN.rc',
+    'locale_settings_zh-TW.rc',
+]
+
+
+resources = []
+for rc in rc_files:
+  resources.extend(env_res.RES(rc))
+
+
+env.Append(
+    LINKFLAGS = [
+        '/INCREMENTAL:NO',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/NOENTRY',
+        '/BASE:"0x3CF00000"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    PDB = '${TARGET}.pdb',
+    no_import_lib = True,       # We don't need the .lib and .exp.
+)
+
+import re
+extract_lang = re.compile(r'locale_settings_(.*)\.res')
+
+locale_dlls = []
+
+for locale_settings_res in resources:
+  s = str(locale_settings_res)
+  #lang = '$CHROME_DIR/locales/' + extract_lang.match(s).group(1)
+  lang = extract_lang.match(s).group(1)
+  g_r_res = s.replace('locale_settings', 'generated_resources')
+  w_s_res = s.replace('locale_settings',
+                      '$WEBKIT_DIR/build/localized_strings/webkit_strings')
+  dll = env.ChromeSharedLibrary(
+      lang,
+      [
+          g_r_res,
+          w_s_res,
+          locale_settings_res,
+      ])
+
+  locale_dlls.append(dll)
+
+i = env.Install('$TARGET_ROOT/locales/', locale_dlls)
+env.Alias('chrome', i)
diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript
index 5f87245..60d9124 100644
--- a/chrome/app/theme/SConscript
+++ b/chrome/app/theme/SConscript
@@ -1,72 +1,72 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env', 'env_res')
-
-env = env.Clone()
-env_res = env_res.Clone()
-
-env_res.Append(
-    CPPPATH = [
-        '.',
-        '#/..',
-    ],
-    RCFLAGS = [
-        ['/l', '0x409'],
-    ],
-)
-
-res = env_res.RES('theme_resources.rc')
-
-
-
-env.Append(
-    LINKFLAGS = [
-        '/INCREMENTAL:NO',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/NOENTRY',
-        '/BASE:"0x3CE00000"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
-
-themes_default = env.ChromeSharedLibrary("$CHROME_DIR/themes/default", res)
-
-env.AddPostAction(themes_default[1], Touch(themes_default[1:]))
-
-i = env.Install("$TARGET_ROOT/themes", themes_default)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env', 'env_res')
+
+env = env.Clone()
+env_res = env_res.Clone()
+
+env_res.Append(
+    CPPPATH = [
+        '.',
+        '#/..',
+    ],
+    RCFLAGS = [
+        ['/l', '0x409'],
+    ],
+)
+
+res = env_res.RES('theme_resources.rc')
+
+
+
+env.Append(
+    LINKFLAGS = [
+        '/INCREMENTAL:NO',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/NOENTRY',
+        '/BASE:"0x3CE00000"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
+
+themes_default = env.ChromeSharedLibrary("$CHROME_DIR/themes/default", res)
+
+env.AddPostAction(themes_default[1], Touch(themes_default[1:]))
+
+i = env.Install("$TARGET_ROOT/themes", themes_default)
+env.Alias('chrome', i)
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index 69f1ad4..52cb332 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -1,327 +1,327 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/app/resources',
-        #'$OBJ_ROOT/google_update',
-        '#/tools/build/win',
-        '#/..',
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'USE_HUNSPELL',
-        'HUNSPELL_CHROME_CLIENT',
-        'LIBXML_STATIC',
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-env.Append(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-
-        '$GOOGLE_UPDATE_DIR',
-        '$CHROME_DIR/third_party/hunspell/src/hunspell',
-        '$CHROME_DIR/third_party/wtl/include',
-        '$NPAPI_DIR',
-        '$LIBXML_DIR/scons/include',
-        '$LIBXML_DIR/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$CHROME_DIR/app',
-        '$WEBKIT_DIR/build/localized_strings',
-        '$ZLIB_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBPNG_DIR',
-        '$BREAKPAD_DIR/src',
-    ],
-)
-
-input_files = [
-    'about_internets_status_view.cc',
-    'alternate_nav_url_fetcher.cc',
-    'app_modal_dialog_queue.cc',
-    'autocomplete/autocomplete.cc',
-    'autocomplete/autocomplete_edit.cc',
-    'autocomplete/autocomplete_popup.cc',
-    'autocomplete/edit_drop_target.cc',
-    'autocomplete/history_contents_provider.cc',
-    'autocomplete/history_url_provider.cc',
-    'autocomplete/keyword_provider.cc',
-    'autocomplete/search_provider.cc',
-    'automation/automation_provider.cc',
-    'automation/automation_provider_list.cc',
-    'automation/automation_resource_tracker.cc',
-    'automation/ui_controls.cc',
-    'automation/url_request_failed_dns_job.cc',
-    'automation/url_request_mock_http_job.cc',
-    'automation/url_request_mock_net_error_job.cc',
-    'automation/url_request_slow_download_job.cc',
-    'back_forward_menu_model.cc',
-    'base_history_model.cc',
-    'bookmark_bar_model.cc',
-    'bookmark_codec.cc',
-    'bookmark_storage.cc',
-    'bookmark_drag_data.cc',
-    'browser.cc',
-    'browser_about_handler.cc',
-    'browser_commands.cc',
-    'browser_init.cc',
-    'browser_list.cc',
-    'browser_main.cc',
-    'browser_prefs.cc',
-    'browser_process.cc',
-    'browser_process_impl.cc',
-    'browser_shutdown.cc',
-    'browser_url_handler.cc',
-    'browsing_data_remover.cc',
-    'browsing_instance.cc',
-    'cache_manager_host.cc',
-    'cancelable_request.cc',
-    'cert_store.cc',
-    'character_encoding.cc',
-    'chrome_plugin_browsing_context.cc',
-    'chrome_plugin_host.cc',
-    'chrome_thread.cc',
-    'controller.cc',
-    'cross_site_request_manager.cc',
-    'dom_ui/chrome_url_data_manager.cc',
-    'dom_ui/dom_ui_host.cc',
-    'dom_ui/html_dialog_contents.cc',
-    'dom_ui/new_tab_ui.cc',
-    'download_exe.cc',
-    'download_file.cc',
-    'download_item_model.cc',
-    'download_manager.cc',
-    'download_tab_view.cc',
-    'download_util.cc',
-    'drag_utils.cc',
-    'encoding_menu_controller_delegate.cc',
-    'encryptor.cc',
-    'external_protocol_dialog.cc',
-    'external_protocol_handler.cc',
-    'external_tab_container.cc',
-    'fav_icon_helper.cc',
-    'find_in_page_controller.cc',
-    'find_in_page_view.cc',
-    'firefox2_importer.cc',
-    'firefox3_importer.cc',
-    'firefox_importer_utils.cc',
-    'firefox_profile_lock.cc',
-    'first_run.cc',
-    'frame_util.cc',
-    'frame_view.cc',
-    'gears_integration.cc',
-    'google_url_tracker.cc',
-    'google_util.cc',
-    'hang_monitor/hung_plugin_action.cc',
-    'hang_monitor/hung_window_detector.cc',
-    'history/archived_database.cc',
-    'history/download_database.cc',
-    'history/expire_history_backend.cc',
-    'history/history.cc',
-    'history/history_backend.cc',
-    'history/history_database.cc',
-    'history/history_types.cc',
-    'history/in_memory_database.cc',
-    'history/in_memory_history_backend.cc',
-    'history/page_usage_data.cc',
-    'history/query_parser.cc',
-    'history/snippet.cc',
-    'history/starred_url_database.cc',
-    'history/text_database.cc',
-    'history/text_database_manager.cc',
-    'history/thumbnail_database.cc',
-    'history/url_database.cc',
-    'history/visit_database.cc',
-    'history/visit_tracker.cc',
-    'history/visitsegment_database.cc',
-    'history_model.cc',
-    'history_tab_ui.cc',
-    'history_view.cc',
-    'icon_loader.cc',
-    'icon_manager.cc',
-    'ie7_password.cc',
-    'ie_importer.cc',
-    'ime_input.cc',
-    'importer.cc',
-    'ipc_status_view.cc',
-    'jankometer.cc',
-    'js_before_unload_handler.cc',
-    'jsmessage_box_handler.cc',
-    'login_prompt.cc',
-    'memory_details.cc',
-    'meta_table_helper.cc',
-    'metrics_log.cc',
-    'metrics_response.cc',
-    'metrics_service.cc',
-    'modal_html_dialog_delegate.cc',
-    'mork_reader.cc',
-    'native_ui_contents.cc',
-    'navigation_controller.cc',
-    'navigation_controller_base.cc',
-    'navigation_entry.cc',
-    'navigation_performance_viewer.cc',
-    'navigation_profiler.cc',
-    'net/dns_global.cc',
-    'net/dns_host_info.cc',
-    'net/dns_master.cc',
-    'net/dns_slave.cc',
-    'network_status_view.cc',
-    'google_update.cc',
-    'page_info_window.cc',
-    'page_load_tracker.cc',
-    'page_state.cc',
-    'password_form_manager.cc',
-    'password_manager.cc',
-    'plugin_installer.cc',
-    'plugin_process_host.cc',
-    'plugin_service.cc',
-    'point_buffer.cc',
-    'printing/page_number.cc',
-    'printing/page_overlays.cc',
-    'printing/page_range.cc',
-    'printing/page_setup.cc',
-    'printing/print_job.cc',
-    'printing/print_job_manager.cc',
-    'printing/print_job_worker.cc',
-    'printing/print_settings.cc',
-    'printing/print_view_manager.cc',
-    'printing/printed_document.cc',
-    'printing/printed_page.cc',
-    'printing/printer_query.cc',
-    'printing/units.cc',
-    'printing/win_printing_context.cc',
-    'profile.cc',
-    'profile_manager.cc',
-    'provisional_load_details.cc',
-    'render_process_host.cc',
-    'render_view_context_menu.cc',
-    'render_view_context_menu_controller.cc',
-    'render_view_host.cc',
-    'render_view_host_manager.cc',
-    'render_widget_helper.cc',
-    'render_widget_host.cc',
-    'render_widget_host_hwnd.cc',
-    'renderer_security_policy.cc',
-    'repost_Form_warning_dialog.cc',
-    'resource_dispatcher_host.cc',
-    'resource_message_filter.cc',
-    'rlz/rlz.cc',
-    'safe_browsing/bloom_filter.cc',
-    'safe_browsing/chunk_range.cc',
-    'safe_browsing/protocol_manager.cc',
-    'safe_browsing/protocol_parser.cc',
-    'safe_browsing/safe_browsing_blocking_page.cc',
-    'safe_browsing/safe_browsing_database.cc',
-    'safe_browsing/safe_browsing_service.cc',
-    'safe_browsing/safe_browsing_util.cc',
-    'sandbox_policy.cc',
-    'save_file.cc',
-    'save_file_manager.cc',
-    'save_item.cc',
-    'save_package.cc',
-    'save_page_model.cc',
-    'session_backend.cc',
-    'session_crashed_view.cc',
-    'session_restore.cc',
-    'session_service.cc',
-    'session_startup_pref.cc',
-    'shell_integration.cc',
-    'simple_vista_frame.cc',
-    'simple_xp_frame.cc',
-    'site_instance.cc',
-    'spellcheck_worditerator.cc',
-    'spellchecker.cc',
-    'ssl_blocking_page.cc',
-    'ssl_error_info.cc',
-    'ssl_manager.cc',
-    'ssl_policy.cc',
-    'status_view.cc',
-    'suspend_controller.cc',
-    'tab_contents.cc',
-    'tab_contents_container_view.cc',
-    'tab_contents_factory.cc',
-    'tab_restore_service.cc',
-    'tab_util.cc',
-    'tabs/dragged_tab_controller.cc',
-    'tabs/dragged_tab_view.cc',
-    'tabs/hwnd_photobooth.cc',
-    'tabs/tab.cc',
-    'tabs/tab_renderer.cc',
-    'tabs/tab_strip.cc',
-    'tabs/tab_strip_model.cc',
-    'tabs/tab_strip_model_order_controller.cc',
-    'task_manager.cc',
-    'task_manager_resource_providers.cc',
-    'template_url.cc',
-    'template_url_fetcher.cc',
-    'template_url_model.cc',
-    'template_url_parser.cc',
-    'template_url_prepopulate_data.cc',
-    'title_chomper.cc',
-    'toolbar_model.cc',
-    'url_fetcher.cc',
-    'url_fetcher_protect.cc',
-    'url_fixer_upper.cc',
-    'user_data_dir_dialog.cc',
-    'user_metrics.cc',
-    'view_source_contents.cc',
-    'visitedlink_master.cc',
-    'vista_frame.cc',
-    'web_app.cc',
-    'web_app_icon_manager.cc',
-    'web_app_launcher.cc',
-    'web_contents.cc',
-    'web_drag_source.cc',
-    'web_drop_target.cc',
-    'webdata/web_data_service.cc',
-    'webdata/web_database.cc',
-    'window_clipping_info.cc',
-    'window_sizer.cc',
-    'wizard/wizard.cc',
-    'xp_frame.cc',
-]
-
-env.ChromeStaticLibrary('browser', input_files)
-
-
-SConscript('debugger/SConscript', exports=['env'])
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/app/resources',
+        #'$OBJ_ROOT/google_update',
+        '#/tools/build/win',
+        '#/..',
+    ],
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+        'USE_HUNSPELL',
+        'HUNSPELL_CHROME_CLIENT',
+        'LIBXML_STATIC',
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+env.Append(
+    CPPPATH = [
+        '$GTEST_DIR/include',
+
+        '$GOOGLE_UPDATE_DIR',
+        '$CHROME_DIR/third_party/hunspell/src/hunspell',
+        '$CHROME_DIR/third_party/wtl/include',
+        '$NPAPI_DIR',
+        '$LIBXML_DIR/scons/include',
+        '$LIBXML_DIR/include',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '$CHROME_DIR/app',
+        '$WEBKIT_DIR/build/localized_strings',
+        '$ZLIB_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$LIBPNG_DIR',
+        '$BREAKPAD_DIR/src',
+    ],
+)
+
+input_files = [
+    'about_internets_status_view.cc',
+    'alternate_nav_url_fetcher.cc',
+    'app_modal_dialog_queue.cc',
+    'autocomplete/autocomplete.cc',
+    'autocomplete/autocomplete_edit.cc',
+    'autocomplete/autocomplete_popup.cc',
+    'autocomplete/edit_drop_target.cc',
+    'autocomplete/history_contents_provider.cc',
+    'autocomplete/history_url_provider.cc',
+    'autocomplete/keyword_provider.cc',
+    'autocomplete/search_provider.cc',
+    'automation/automation_provider.cc',
+    'automation/automation_provider_list.cc',
+    'automation/automation_resource_tracker.cc',
+    'automation/ui_controls.cc',
+    'automation/url_request_failed_dns_job.cc',
+    'automation/url_request_mock_http_job.cc',
+    'automation/url_request_mock_net_error_job.cc',
+    'automation/url_request_slow_download_job.cc',
+    'back_forward_menu_model.cc',
+    'base_history_model.cc',
+    'bookmark_bar_model.cc',
+    'bookmark_codec.cc',
+    'bookmark_storage.cc',
+    'bookmark_drag_data.cc',
+    'browser.cc',
+    'browser_about_handler.cc',
+    'browser_commands.cc',
+    'browser_init.cc',
+    'browser_list.cc',
+    'browser_main.cc',
+    'browser_prefs.cc',
+    'browser_process.cc',
+    'browser_process_impl.cc',
+    'browser_shutdown.cc',
+    'browser_url_handler.cc',
+    'browsing_data_remover.cc',
+    'browsing_instance.cc',
+    'cache_manager_host.cc',
+    'cancelable_request.cc',
+    'cert_store.cc',
+    'character_encoding.cc',
+    'chrome_plugin_browsing_context.cc',
+    'chrome_plugin_host.cc',
+    'chrome_thread.cc',
+    'controller.cc',
+    'cross_site_request_manager.cc',
+    'dom_ui/chrome_url_data_manager.cc',
+    'dom_ui/dom_ui_host.cc',
+    'dom_ui/html_dialog_contents.cc',
+    'dom_ui/new_tab_ui.cc',
+    'download_exe.cc',
+    'download_file.cc',
+    'download_item_model.cc',
+    'download_manager.cc',
+    'download_tab_view.cc',
+    'download_util.cc',
+    'drag_utils.cc',
+    'encoding_menu_controller_delegate.cc',
+    'encryptor.cc',
+    'external_protocol_dialog.cc',
+    'external_protocol_handler.cc',
+    'external_tab_container.cc',
+    'fav_icon_helper.cc',
+    'find_in_page_controller.cc',
+    'find_in_page_view.cc',
+    'firefox2_importer.cc',
+    'firefox3_importer.cc',
+    'firefox_importer_utils.cc',
+    'firefox_profile_lock.cc',
+    'first_run.cc',
+    'frame_util.cc',
+    'frame_view.cc',
+    'gears_integration.cc',
+    'google_url_tracker.cc',
+    'google_util.cc',
+    'hang_monitor/hung_plugin_action.cc',
+    'hang_monitor/hung_window_detector.cc',
+    'history/archived_database.cc',
+    'history/download_database.cc',
+    'history/expire_history_backend.cc',
+    'history/history.cc',
+    'history/history_backend.cc',
+    'history/history_database.cc',
+    'history/history_types.cc',
+    'history/in_memory_database.cc',
+    'history/in_memory_history_backend.cc',
+    'history/page_usage_data.cc',
+    'history/query_parser.cc',
+    'history/snippet.cc',
+    'history/starred_url_database.cc',
+    'history/text_database.cc',
+    'history/text_database_manager.cc',
+    'history/thumbnail_database.cc',
+    'history/url_database.cc',
+    'history/visit_database.cc',
+    'history/visit_tracker.cc',
+    'history/visitsegment_database.cc',
+    'history_model.cc',
+    'history_tab_ui.cc',
+    'history_view.cc',
+    'icon_loader.cc',
+    'icon_manager.cc',
+    'ie7_password.cc',
+    'ie_importer.cc',
+    'ime_input.cc',
+    'importer.cc',
+    'ipc_status_view.cc',
+    'jankometer.cc',
+    'js_before_unload_handler.cc',
+    'jsmessage_box_handler.cc',
+    'login_prompt.cc',
+    'memory_details.cc',
+    'meta_table_helper.cc',
+    'metrics_log.cc',
+    'metrics_response.cc',
+    'metrics_service.cc',
+    'modal_html_dialog_delegate.cc',
+    'mork_reader.cc',
+    'native_ui_contents.cc',
+    'navigation_controller.cc',
+    'navigation_controller_base.cc',
+    'navigation_entry.cc',
+    'navigation_performance_viewer.cc',
+    'navigation_profiler.cc',
+    'net/dns_global.cc',
+    'net/dns_host_info.cc',
+    'net/dns_master.cc',
+    'net/dns_slave.cc',
+    'network_status_view.cc',
+    'google_update.cc',
+    'page_info_window.cc',
+    'page_load_tracker.cc',
+    'page_state.cc',
+    'password_form_manager.cc',
+    'password_manager.cc',
+    'plugin_installer.cc',
+    'plugin_process_host.cc',
+    'plugin_service.cc',
+    'point_buffer.cc',
+    'printing/page_number.cc',
+    'printing/page_overlays.cc',
+    'printing/page_range.cc',
+    'printing/page_setup.cc',
+    'printing/print_job.cc',
+    'printing/print_job_manager.cc',
+    'printing/print_job_worker.cc',
+    'printing/print_settings.cc',
+    'printing/print_view_manager.cc',
+    'printing/printed_document.cc',
+    'printing/printed_page.cc',
+    'printing/printer_query.cc',
+    'printing/units.cc',
+    'printing/win_printing_context.cc',
+    'profile.cc',
+    'profile_manager.cc',
+    'provisional_load_details.cc',
+    'render_process_host.cc',
+    'render_view_context_menu.cc',
+    'render_view_context_menu_controller.cc',
+    'render_view_host.cc',
+    'render_view_host_manager.cc',
+    'render_widget_helper.cc',
+    'render_widget_host.cc',
+    'render_widget_host_hwnd.cc',
+    'renderer_security_policy.cc',
+    'repost_Form_warning_dialog.cc',
+    'resource_dispatcher_host.cc',
+    'resource_message_filter.cc',
+    'rlz/rlz.cc',
+    'safe_browsing/bloom_filter.cc',
+    'safe_browsing/chunk_range.cc',
+    'safe_browsing/protocol_manager.cc',
+    'safe_browsing/protocol_parser.cc',
+    'safe_browsing/safe_browsing_blocking_page.cc',
+    'safe_browsing/safe_browsing_database.cc',
+    'safe_browsing/safe_browsing_service.cc',
+    'safe_browsing/safe_browsing_util.cc',
+    'sandbox_policy.cc',
+    'save_file.cc',
+    'save_file_manager.cc',
+    'save_item.cc',
+    'save_package.cc',
+    'save_page_model.cc',
+    'session_backend.cc',
+    'session_crashed_view.cc',
+    'session_restore.cc',
+    'session_service.cc',
+    'session_startup_pref.cc',
+    'shell_integration.cc',
+    'simple_vista_frame.cc',
+    'simple_xp_frame.cc',
+    'site_instance.cc',
+    'spellcheck_worditerator.cc',
+    'spellchecker.cc',
+    'ssl_blocking_page.cc',
+    'ssl_error_info.cc',
+    'ssl_manager.cc',
+    'ssl_policy.cc',
+    'status_view.cc',
+    'suspend_controller.cc',
+    'tab_contents.cc',
+    'tab_contents_container_view.cc',
+    'tab_contents_factory.cc',
+    'tab_restore_service.cc',
+    'tab_util.cc',
+    'tabs/dragged_tab_controller.cc',
+    'tabs/dragged_tab_view.cc',
+    'tabs/hwnd_photobooth.cc',
+    'tabs/tab.cc',
+    'tabs/tab_renderer.cc',
+    'tabs/tab_strip.cc',
+    'tabs/tab_strip_model.cc',
+    'tabs/tab_strip_model_order_controller.cc',
+    'task_manager.cc',
+    'task_manager_resource_providers.cc',
+    'template_url.cc',
+    'template_url_fetcher.cc',
+    'template_url_model.cc',
+    'template_url_parser.cc',
+    'template_url_prepopulate_data.cc',
+    'title_chomper.cc',
+    'toolbar_model.cc',
+    'url_fetcher.cc',
+    'url_fetcher_protect.cc',
+    'url_fixer_upper.cc',
+    'user_data_dir_dialog.cc',
+    'user_metrics.cc',
+    'view_source_contents.cc',
+    'visitedlink_master.cc',
+    'vista_frame.cc',
+    'web_app.cc',
+    'web_app_icon_manager.cc',
+    'web_app_launcher.cc',
+    'web_contents.cc',
+    'web_drag_source.cc',
+    'web_drop_target.cc',
+    'webdata/web_data_service.cc',
+    'webdata/web_database.cc',
+    'window_clipping_info.cc',
+    'window_sizer.cc',
+    'wizard/wizard.cc',
+    'xp_frame.cc',
+]
+
+env.ChromeStaticLibrary('browser', input_files)
+
+
+SConscript('debugger/SConscript', exports=['env'])
diff --git a/chrome/browser/debugger/SConscript b/chrome/browser/debugger/SConscript
index ba79349..18f91f0 100644
--- a/chrome/browser/debugger/SConscript
+++ b/chrome/browser/debugger/SConscript
@@ -1,77 +1,77 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '#/..',
-    ],
-    CPPDEFINES = [
-        'LIBXML_STATIC',
-        'U_STATIC_IMPLEMENTATION',
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-env.Append(
-    CPPPATH = [
-        '$CHROME_DIR/third_party/wtl/include',
-        '$NPAPI_DIR',
-        '$LIBXML_DIR/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$CHROME_DIR/app',
-        '$ZLIB_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBPNG_DIR',
-        '$BREAKPAD_DIR/src',
-    ],
-)
-
-input_files = [
-    'debugger_contents.cc',
-    'debugger_io_socket.cc',
-    'debugger_node.cc',
-    'debugger_shell.cc',
-    'debugger_view.cc',
-    'debugger_window.cc',
-    'debugger_wrapper.cc',
-]
-
-env.ChromeStaticLibrary('debugger', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '#/..',
+    ],
+    CPPDEFINES = [
+        'LIBXML_STATIC',
+        'U_STATIC_IMPLEMENTATION',
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+env.Append(
+    CPPPATH = [
+        '$CHROME_DIR/third_party/wtl/include',
+        '$NPAPI_DIR',
+        '$LIBXML_DIR/include',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '$CHROME_DIR/app',
+        '$ZLIB_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$LIBPNG_DIR',
+        '$BREAKPAD_DIR/src',
+    ],
+)
+
+input_files = [
+    'debugger_contents.cc',
+    'debugger_io_socket.cc',
+    'debugger_node.cc',
+    'debugger_shell.cc',
+    'debugger_view.cc',
+    'debugger_window.cc',
+    'debugger_wrapper.cc',
+]
+
+env.ChromeStaticLibrary('debugger', input_files)
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index 20ca3dd..f494e9b 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -1,149 +1,149 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/app/resources',
-        #'$OBJ_ROOT/google_update',
-        '#/tools/build/win',
-        '#/..',
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'USE_HUNSPELL',
-        'HUNSPELL_CHROME_CLIENT',
-        'LIBXML_STATIC',
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-env.Append(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-
-        '$GOOGLE_UPDATE_DIR',
-        '$CHROME_DIR/third_party/hunspell/src/hunspell',
-        '$CHROME_DIR/third_party/wtl/include',
-        '$NPAPI_DIR',
-        '$LIBXML_DIR/scons/include',
-        '$LIBXML_DIR/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$CHROME_DIR/app',
-        '$WEBKIT_DIR/build/localized_strings',
-        '$ZLIB_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBPNG_DIR',
-        '$BREAKPAD_DIR/src',
-    ],
-)
-
-input_files = [
-    'about_chrome_view.cc',
-    'bookmark_bar_view.cc',
-    'bookmark_bubble_view.cc',
-    'bookmark_editor_view.cc',
-    'bug_report_view.cc',
-    'clear_browsing_data.cc',
-    'constrained_window_animation.cc',
-    'constrained_window_impl.cc',
-    'delay_view.cc',
-    'download_item_view.cc',
-    'download_shelf_view.cc',
-    'download_started_animation.cc',
-    'edit_keyword_controller.cc',
-    'event_utils.cc',
-    'first_run_bubble.cc',
-    'first_run_customize_view.cc',
-    'first_run_view.cc',
-    'first_run_view_base.cc',
-    'frame/aero_glass_frame.cc',
-    'frame/aero_glass_non_client_view.cc',
-    'frame/browser_view.cc',
-    'frame/browser_view2.cc',
-    'frame/browser_window_factory.cc',
-    'frame/opaque_frame.cc',
-    'frame/opaque_non_client_view.cc',
-    'go_button.cc',
-    'html_dialog_view.cc',
-    'hung_renderer_view.cc',
-    'hwnd_html_view.cc',
-    'importer_lock_view.cc',
-    'importer_view.cc',
-    'importing_progress_view.cc',
-    'info_bar_alternate_nav_url_view.cc',
-    'info_bar_confirm_view.cc',
-    'info_bar_item_view.cc',
-    'info_bar_message_view.cc',
-    'info_bar_view.cc',
-    'info_bubble.cc',
-    'input_window.cc',
-    'keyword_editor_view.cc',
-    'location_bar_view.cc',
-    'login_view.cc',
-    'options/advanced_contents_view.cc',
-    'options/advanced_page_view.cc',
-    'options/content_page_view.cc',
-    'options/cookies_view.cc',
-    'options/fonts_languages_window_view.cc',
-    'options/fonts_page_view.cc',
-    'options/general_page_view.cc',
-    'options/language_combobox_model.cc',
-    'options/languages_page_view.cc',
-    'options/options_group_view.cc',
-    'options/options_page_view.cc',
-    'options/options_window_view.cc',
-    'password_manager_view.cc',
-    'restart_message_box.cc',
-    'sad_tab_view.cc',
-    'shelf_item_dialog.cc',
-    'shell_dialogs.cc',
-    'star_toggle.cc',
-    'status_bubble.cc',
-    'tab_icon_view.cc',
-    'theme_helpers.cc',
-    'toolbar_star_toggle.cc',
-    'toolbar_view.cc',
-]
-
-env.ChromeStaticLibrary('browser_views', input_files)
-
-
-SConscript('debugger/SConscript', exports=['env'])
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/app/resources',
+        #'$OBJ_ROOT/google_update',
+        '#/tools/build/win',
+        '#/..',
+    ],
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+        'USE_HUNSPELL',
+        'HUNSPELL_CHROME_CLIENT',
+        'LIBXML_STATIC',
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+env.Append(
+    CPPPATH = [
+        '$GTEST_DIR/include',
+
+        '$GOOGLE_UPDATE_DIR',
+        '$CHROME_DIR/third_party/hunspell/src/hunspell',
+        '$CHROME_DIR/third_party/wtl/include',
+        '$NPAPI_DIR',
+        '$LIBXML_DIR/scons/include',
+        '$LIBXML_DIR/include',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '$CHROME_DIR/app',
+        '$WEBKIT_DIR/build/localized_strings',
+        '$ZLIB_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$LIBPNG_DIR',
+        '$BREAKPAD_DIR/src',
+    ],
+)
+
+input_files = [
+    'about_chrome_view.cc',
+    'bookmark_bar_view.cc',
+    'bookmark_bubble_view.cc',
+    'bookmark_editor_view.cc',
+    'bug_report_view.cc',
+    'clear_browsing_data.cc',
+    'constrained_window_animation.cc',
+    'constrained_window_impl.cc',
+    'delay_view.cc',
+    'download_item_view.cc',
+    'download_shelf_view.cc',
+    'download_started_animation.cc',
+    'edit_keyword_controller.cc',
+    'event_utils.cc',
+    'first_run_bubble.cc',
+    'first_run_customize_view.cc',
+    'first_run_view.cc',
+    'first_run_view_base.cc',
+    'frame/aero_glass_frame.cc',
+    'frame/aero_glass_non_client_view.cc',
+    'frame/browser_view.cc',
+    'frame/browser_view2.cc',
+    'frame/browser_window_factory.cc',
+    'frame/opaque_frame.cc',
+    'frame/opaque_non_client_view.cc',
+    'go_button.cc',
+    'html_dialog_view.cc',
+    'hung_renderer_view.cc',
+    'hwnd_html_view.cc',
+    'importer_lock_view.cc',
+    'importer_view.cc',
+    'importing_progress_view.cc',
+    'info_bar_alternate_nav_url_view.cc',
+    'info_bar_confirm_view.cc',
+    'info_bar_item_view.cc',
+    'info_bar_message_view.cc',
+    'info_bar_view.cc',
+    'info_bubble.cc',
+    'input_window.cc',
+    'keyword_editor_view.cc',
+    'location_bar_view.cc',
+    'login_view.cc',
+    'options/advanced_contents_view.cc',
+    'options/advanced_page_view.cc',
+    'options/content_page_view.cc',
+    'options/cookies_view.cc',
+    'options/fonts_languages_window_view.cc',
+    'options/fonts_page_view.cc',
+    'options/general_page_view.cc',
+    'options/language_combobox_model.cc',
+    'options/languages_page_view.cc',
+    'options/options_group_view.cc',
+    'options/options_page_view.cc',
+    'options/options_window_view.cc',
+    'password_manager_view.cc',
+    'restart_message_box.cc',
+    'sad_tab_view.cc',
+    'shelf_item_dialog.cc',
+    'shell_dialogs.cc',
+    'star_toggle.cc',
+    'status_bubble.cc',
+    'tab_icon_view.cc',
+    'theme_helpers.cc',
+    'toolbar_star_toggle.cc',
+    'toolbar_view.cc',
+]
+
+env.ChromeStaticLibrary('browser_views', input_files)
+
+
+SConscript('debugger/SConscript', exports=['env'])
diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index 268a882..0872dcb 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -1,190 +1,190 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env', 'env_test')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/app/resources',
-        '#/tools/build/win',
-        '#/..',
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-env.Append(
-    CPPPATH = [
-        'third_party/wtl/include',
-        '$NPAPI_DIR',
-        '$LIBXML_DIR/scons/include',
-        '$LIBXML_DIR/include',
-
-        'app',
-        '$WEBKIT_DIR/build/localized_strings',
-
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBPNG_DIR',
-        '$ZLIB_DIR',
-        '$BREAKPAD_DIR/src',
-        '$LIBJPEG_DIR',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-    ],
-)
-
-input_files = [
-    'animation.cc',
-    'child_process.cc',
-    'chrome_constants.cc',
-    'chrome_counters.cc',
-    'chrome_paths.cc',
-    'chrome_plugin_lib.cc',
-    'chrome_plugin_util.cc',
-    'chrome_process_filter.cc',
-    'chrome_switches.cc',
-    'classfactory.cc',
-    'clipboard_service.cc',
-    'common_glue.cc',
-    'debug_flags.cc',
-    'drag_drop_types.cc',
-    'env_util.cc',
-    'env_vars.cc',
-    'gfx/chrome_canvas.cc',
-    'gfx/chrome_font.cc',
-    'gfx/color_utils.cc',
-    'gfx/emf.cc',
-    'gfx/icon_util.cc',
-    'gfx/path.cc',
-    'gfx/url_elider.cc',
-    'ipc_channel.cc',
-    'ipc_channel_proxy.cc',
-    'ipc_logging.cc',
-    'ipc_message.cc',
-    'ipc_message_utils.cc',
-    'ipc_sync_channel.cc',
-    'ipc_sync_message.cc',
-    'jpeg_codec.cc',
-    'json_value_serializer.cc',
-    'jstemplate_builder.cc',
-    'l10n_util.cc',
-    'libxml_utils.cc',
-    'logging_chrome.cc',
-    'message_router.cc',
-    'net/cookie_monster_sqlite.cc',
-    'net/url_request_intercept_job.cc',
-    'notification_service.cc',
-    'os_exchange_data.cc',
-    'plugin_messages.cc',
-    'pref_names.cc',
-    'pref_service.cc',
-    'process_watcher.cc',
-    'rand_util.cc',
-    'render_messages.cc',
-    'resource_bundle.cc',
-    'resource_dispatcher.cc',
-    'security_filter_peer.cc',
-    'slide_animation.cc',
-    'sqlite_compiled_statement.cc',
-    'sqlite_utils.cc',
-    'task_queue.cc',
-    'throb_animation.cc',
-    'thumbnail_score.cc',
-    'time_format.cc',
-    'visitedlink_common.cc',
-    'win_safe_util.cc',
-    'win_util.cc',
-    'worker_thread_ticker.cc',
-]
-
-env.ChromeStaticLibrary('common', input_files)
-
-
-env_test = env_test.Clone()
-
-env_test.Append(
-    CPPPATH = [
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-        '$GTEST_DIR/include',
-    ],
-    LIBS = [
-        'base',
-        'gtest',
-        'icuuc',
-    ],
-)
-
-env_test.Append(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/DEBUG',
-        '/MACHINE:X86',
-        '/FIXED:No',
-    ],
-    LIBS = [
-        'rpcrt4.lib',
-        'shlwapi.lib',
-        'winmm.lib',
-    ],
-)
-
-ipc_tests_files = [
-    '$BASE_DIR/perftimer$OBJSUFFIX',
-    'ipc_fuzzing_tests.cc',
-    'ipc_tests.cc',
-]
-
-libs = [
-    'common.lib',
-]
-
-ipc_tests = env_test.ChromeTestProgram('ipc_tests.exe', ipc_tests_files + libs)
-
-i = env_test.Install('$TARGET_ROOT', ipc_tests)
-Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env', 'env_test')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/app/resources',
+        '#/tools/build/win',
+        '#/..',
+    ],
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+env.Append(
+    CPPPATH = [
+        'third_party/wtl/include',
+        '$NPAPI_DIR',
+        '$LIBXML_DIR/scons/include',
+        '$LIBXML_DIR/include',
+
+        'app',
+        '$WEBKIT_DIR/build/localized_strings',
+
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$LIBPNG_DIR',
+        '$ZLIB_DIR',
+        '$BREAKPAD_DIR/src',
+        '$LIBJPEG_DIR',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+    ],
+)
+
+input_files = [
+    'animation.cc',
+    'child_process.cc',
+    'chrome_constants.cc',
+    'chrome_counters.cc',
+    'chrome_paths.cc',
+    'chrome_plugin_lib.cc',
+    'chrome_plugin_util.cc',
+    'chrome_process_filter.cc',
+    'chrome_switches.cc',
+    'classfactory.cc',
+    'clipboard_service.cc',
+    'common_glue.cc',
+    'debug_flags.cc',
+    'drag_drop_types.cc',
+    'env_util.cc',
+    'env_vars.cc',
+    'gfx/chrome_canvas.cc',
+    'gfx/chrome_font.cc',
+    'gfx/color_utils.cc',
+    'gfx/emf.cc',
+    'gfx/icon_util.cc',
+    'gfx/path.cc',
+    'gfx/url_elider.cc',
+    'ipc_channel.cc',
+    'ipc_channel_proxy.cc',
+    'ipc_logging.cc',
+    'ipc_message.cc',
+    'ipc_message_utils.cc',
+    'ipc_sync_channel.cc',
+    'ipc_sync_message.cc',
+    'jpeg_codec.cc',
+    'json_value_serializer.cc',
+    'jstemplate_builder.cc',
+    'l10n_util.cc',
+    'libxml_utils.cc',
+    'logging_chrome.cc',
+    'message_router.cc',
+    'net/cookie_monster_sqlite.cc',
+    'net/url_request_intercept_job.cc',
+    'notification_service.cc',
+    'os_exchange_data.cc',
+    'plugin_messages.cc',
+    'pref_names.cc',
+    'pref_service.cc',
+    'process_watcher.cc',
+    'rand_util.cc',
+    'render_messages.cc',
+    'resource_bundle.cc',
+    'resource_dispatcher.cc',
+    'security_filter_peer.cc',
+    'slide_animation.cc',
+    'sqlite_compiled_statement.cc',
+    'sqlite_utils.cc',
+    'task_queue.cc',
+    'throb_animation.cc',
+    'thumbnail_score.cc',
+    'time_format.cc',
+    'visitedlink_common.cc',
+    'win_safe_util.cc',
+    'win_util.cc',
+    'worker_thread_ticker.cc',
+]
+
+env.ChromeStaticLibrary('common', input_files)
+
+
+env_test = env_test.Clone()
+
+env_test.Append(
+    CPPPATH = [
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+        '$GTEST_DIR/include',
+    ],
+    LIBS = [
+        'base',
+        'gtest',
+        'icuuc',
+    ],
+)
+
+env_test.Append(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/DEBUG',
+        '/MACHINE:X86',
+        '/FIXED:No',
+    ],
+    LIBS = [
+        'rpcrt4.lib',
+        'shlwapi.lib',
+        'winmm.lib',
+    ],
+)
+
+ipc_tests_files = [
+    '$BASE_DIR/perftimer$OBJSUFFIX',
+    'ipc_fuzzing_tests.cc',
+    'ipc_tests.cc',
+]
+
+libs = [
+    'common.lib',
+]
+
+ipc_tests = env_test.ChromeTestProgram('ipc_tests.exe', ipc_tests_files + libs)
+
+i = env_test.Install('$TARGET_ROOT', ipc_tests)
+Alias('chrome', i)
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index 64b770d..de779f3 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -1,187 +1,187 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env', 'env_res', 'env_test')
-
-
-env = env.Clone()
-
-env['LIBS'].remove('DelayImp.lib')
-
-env_res = env_res.Clone()
-env_test = env_test.Clone()
-
-
-env_res.Append(
-    CPPPATH = [
-        "$TARGET_ROOT",
-        ".",
-        "#/..",
-    ],
-    RCFLAGS = [
-        ["/l", "0x409"],
-    ],
-)
-
-resources = env_res.RES('mini_installer.rc')
-
-
-env.Prepend(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '#/..',
-    ],
-    CCFLAGS = [
-        '/TP',
-        '/GS-',         # because we link with /NODEFAULTLIB
-    ],
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/NODEFAULTLIB',
-        '/DEBUG',
-        '/SUBSYSTEM:WINDOWS',
-        '/OPT:NOWIN98',
-        '/ENTRY:"MainEntryPoint"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/SAFESEH:NO',
-        '/NXCOMPAT',
-        '/DYNAMICBASE:NO',
-
-        '/PDB:${TARGETS[1]}',
-        '/MAP:${TARGETS[2]}',
-    ],
-    LIBS = [
-        'shlwapi.lib',
-    ],
-)
-
-env['CCFLAGS'].remove('/RTC1')
-
-components = [
-    "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
-    "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
-    "$TARGET_ROOT/chrome_dll.lib",
-]
-
-input_files = [
-    "mini_installer.cc",
-    "pe_resource.cc",
-]
-
-exe = env.ChromeProgram(['mini_installer',
-                   'mini_installer.pdb',
-                   'mini_installer.map'],
-                  components + resources + input_files)
-i = env.Install('$TARGET_ROOT', exe)
-env.Alias('chrome', i)
-
-
-env.AppendENVPath('PATH', r'C:\WINDOWS\system32')
-
-packed = env.Command('$TARGET_ROOT/packed_files.txt',
-                     ['$CHROME_DIR/tools/build/win/create_installer_archive.py',
-                      '$CHROME_DIR/installer/mini_installer/chrome.release'],
-                     ('$PYTHON ${SOURCES[0]}'
-                      ' --output_dir=${TARGET.dir}'
-                      ' --input_file=${SOURCES[1]}'))
-env.Depends(packed, '$TARGET_ROOT/setup.exe')
-
-
-env.ChromeVersionRC('mini_installer_exe_version.rc',
-                    'mini_installer_exe_version.rc.version',
-                    PWD=Dir('.'))
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '#/..',
-    ],
-    LIBS = [
-        'gtest',
-        'icuuc',
-        'common',
-        'base',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'rpcrt4.lib',
-        'shlwapi.lib',
-    ],
-)
-
-input_files = [
-    '../setup/setup_constants$OBJSUFFIX',
-    '../util/copy_tree_work_item_unittest.cc',
-    '../util/create_dir_work_item_unittest.cc',
-    '../util/create_reg_key_work_item_unittest.cc',
-    '../util/delete_tree_work_item_unittest.cc',
-    '../util/helper_unittest.cc',
-    '../util/install_util_unittest.cc',
-    '../util/run_all_unittests.cc',
-    '../util/set_reg_value_work_item_unittest.cc',
-    '../util/work_item_list_unittest.cc',
-]
-
-libs = [
-    '../util/util.lib',
-]
-
-exe = env_test.ChromeTestProgram(['installer_unittests',
-                        'installer_unittests.pdb'],
-                       input_files + libs)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env', 'env_res', 'env_test')
+
+
+env = env.Clone()
+
+env['LIBS'].remove('DelayImp.lib')
+
+env_res = env_res.Clone()
+env_test = env_test.Clone()
+
+
+env_res.Append(
+    CPPPATH = [
+        "$TARGET_ROOT",
+        ".",
+        "#/..",
+    ],
+    RCFLAGS = [
+        ["/l", "0x409"],
+    ],
+)
+
+resources = env_res.RES('mini_installer.rc')
+
+
+env.Prepend(
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '#/..',
+    ],
+    CCFLAGS = [
+        '/TP',
+        '/GS-',         # because we link with /NODEFAULTLIB
+    ],
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/NODEFAULTLIB',
+        '/DEBUG',
+        '/SUBSYSTEM:WINDOWS',
+        '/OPT:NOWIN98',
+        '/ENTRY:"MainEntryPoint"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/SAFESEH:NO',
+        '/NXCOMPAT',
+        '/DYNAMICBASE:NO',
+
+        '/PDB:${TARGETS[1]}',
+        '/MAP:${TARGETS[2]}',
+    ],
+    LIBS = [
+        'shlwapi.lib',
+    ],
+)
+
+env['CCFLAGS'].remove('/RTC1')
+
+components = [
+    "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
+    "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
+    "$TARGET_ROOT/chrome_dll.lib",
+]
+
+input_files = [
+    "mini_installer.cc",
+    "pe_resource.cc",
+]
+
+exe = env.ChromeProgram(['mini_installer',
+                   'mini_installer.pdb',
+                   'mini_installer.map'],
+                  components + resources + input_files)
+i = env.Install('$TARGET_ROOT', exe)
+env.Alias('chrome', i)
+
+
+env.AppendENVPath('PATH', r'C:\WINDOWS\system32')
+
+packed = env.Command('$TARGET_ROOT/packed_files.txt',
+                     ['$CHROME_DIR/tools/build/win/create_installer_archive.py',
+                      '$CHROME_DIR/installer/mini_installer/chrome.release'],
+                     ('$PYTHON ${SOURCES[0]}'
+                      ' --output_dir=${TARGET.dir}'
+                      ' --input_file=${SOURCES[1]}'))
+env.Depends(packed, '$TARGET_ROOT/setup.exe')
+
+
+env.ChromeVersionRC('mini_installer_exe_version.rc',
+                    'mini_installer_exe_version.rc.version',
+                    PWD=Dir('.'))
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '#/..',
+    ],
+    LIBS = [
+        'gtest',
+        'icuuc',
+        'common',
+        'base',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'comsupp.lib',
+        'oleacc.lib',
+        'rpcrt4.lib',
+        'shlwapi.lib',
+    ],
+)
+
+input_files = [
+    '../setup/setup_constants$OBJSUFFIX',
+    '../util/copy_tree_work_item_unittest.cc',
+    '../util/create_dir_work_item_unittest.cc',
+    '../util/create_reg_key_work_item_unittest.cc',
+    '../util/delete_tree_work_item_unittest.cc',
+    '../util/helper_unittest.cc',
+    '../util/install_util_unittest.cc',
+    '../util/run_all_unittests.cc',
+    '../util/set_reg_value_work_item_unittest.cc',
+    '../util/work_item_list_unittest.cc',
+]
+
+libs = [
+    '../util/util.lib',
+]
+
+exe = env_test.ChromeTestProgram(['installer_unittests',
+                        'installer_unittests.pdb'],
+                       input_files + libs)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env.Alias('chrome', i)
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index 3f71843..1a72d45 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -1,120 +1,120 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env', 'env_res')
-
-env = env.Clone()
-env_res = env_res.Clone()
-
-
-env_res.Append(
-  CPPPATH = [
-    "$TARGET_ROOT",
-    ".",
-    "#/..",
-  ],
-  RCFLAGS = [
-    ["/l", "0x409"],
-  ],
-)
-
-
-resources = [
-    env_res.RES('setup.rc'),
-    env_res.RES('../util/setup_strings.rc'),
-]
-
-
-env.Prepend(
-    CPPPATH = [
-        '../util',
-        '$TARGET_ROOT',
-        '.',
-        '#/..',
-    ],
-    LIBS = [
-        'bspatch',
-        'lzma_sdk',
-        'icuuc',
-        'common',
-        'base',
-    ],
-)
-
-env.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/OPT:NOWIN98',
-        '/SUBSYSTEM:WINDOWS',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/PDB:${TARGETS[1]}',
-        '/MAP:${TARGETS[2]}',
-    ],
-    LIBS = [
-        'shlwapi.lib',
-        'msi.lib',
-    ],
-)
-
-input_files = [
-    'install.cc',
-    'main.cc',
-    'setup.cc',
-    'setup_constants.cc',
-    'uninstall.cc',
-]
-
-libs = [
-    '../util/util.lib',
-]
-
-exe = env.ChromeProgram(['setup',
-                   'setup.pdb',
-                   'setup.map'],
-                  resources + input_files + libs)
-i = env.Install('$TARGET_ROOT', exe)
-
-env.Alias('chrome', i)
-
-
-env.ChromeVersionRC('setup_exe_version.rc',
-                    'setup_exe_version.rc.version',
-                    PWD = env.Dir('.'))
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env', 'env_res')
+
+env = env.Clone()
+env_res = env_res.Clone()
+
+
+env_res.Append(
+  CPPPATH = [
+    "$TARGET_ROOT",
+    ".",
+    "#/..",
+  ],
+  RCFLAGS = [
+    ["/l", "0x409"],
+  ],
+)
+
+
+resources = [
+    env_res.RES('setup.rc'),
+    env_res.RES('../util/setup_strings.rc'),
+]
+
+
+env.Prepend(
+    CPPPATH = [
+        '../util',
+        '$TARGET_ROOT',
+        '.',
+        '#/..',
+    ],
+    LIBS = [
+        'bspatch',
+        'lzma_sdk',
+        'icuuc',
+        'common',
+        'base',
+    ],
+)
+
+env.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/OPT:NOWIN98',
+        '/SUBSYSTEM:WINDOWS',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/PDB:${TARGETS[1]}',
+        '/MAP:${TARGETS[2]}',
+    ],
+    LIBS = [
+        'shlwapi.lib',
+        'msi.lib',
+    ],
+)
+
+input_files = [
+    'install.cc',
+    'main.cc',
+    'setup.cc',
+    'setup_constants.cc',
+    'uninstall.cc',
+]
+
+libs = [
+    '../util/util.lib',
+]
+
+exe = env.ChromeProgram(['setup',
+                   'setup.pdb',
+                   'setup.map'],
+                  resources + input_files + libs)
+i = env.Install('$TARGET_ROOT', exe)
+
+env.Alias('chrome', i)
+
+
+env.ChromeVersionRC('setup_exe_version.rc',
+                    'setup_exe_version.rc.version',
+                    PWD = env.Dir('.'))
diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript
index 8b4a942..dab0f1d 100644
--- a/chrome/installer/util/SConscript
+++ b/chrome/installer/util/SConscript
@@ -1,97 +1,97 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$LZMA_SDK_DIR',
-        '$CHROME_DIR/third_party/wtl/include',
-        '$NPAPI_DIR',
-        '$LIBXML_DIR/include',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBPNG_DIR',
-        '$ZLIB_DIR',
-        '$BREAKPAD_DIR/src',
-        '$LIBJPEG_DIR',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '#/..',
-        '.',
-    ],
-    CPPDEFINES = [
-        "_LZMA_IN_CB",
-        "LIBXML_STATIC",
-        "PNG_USER_CONFIG",
-        "CHROME_PNG_WRITE_SUPPORT"
-        "U_STATIC_IMPLEMENTATION",
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-input_files = [
-    '../../app/google_update_settings$OBJSUFFIX',
-    'copy_tree_work_item.cc',
-    'create_dir_work_item.cc',
-    'create_reg_key_work_item.cc',
-    'delete_tree_work_item.cc',
-    'google_update_constants.cc',
-    'helper.cc',
-    'install_util.cc',
-    'l10n_string_util.cc',
-    'logging_installer.cc',
-    'lzma_util.cc',
-    'set_reg_value_work_item.cc',
-    'shell_util.cc',
-    'util_constants.cc',
-    'version.cc',
-    'work_item.cc',
-    'work_item_list.cc',
-]
-
-x = env.ChromeStaticLibrary('util', input_files)
-
-
-# create_string_rc.py imports FP.py from the tools/grit/grit/extern
-# directory, so add that to PYTHONPATH for this command execution.
-env_x = env.Clone()
-env_x.AppendENVPath('PYTHONPATH', [Dir('#/../tools/grit/grit/extern').abspath])
-env_x.Command(['$CHROME_DIR/installer/util/setup_strings.rc',
-               '$CHROME_DIR/installer/util/setup_strings.h'],
-              ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py',
-               '$CHROME_DIR/app/generated_resources.grd'] +
-               env.Glob('$CHROME_DIR/app/resources/*.xtb'),
-              "$PYTHON ${SOURCES[0]} ${TARGET.dir}")
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '$LZMA_SDK_DIR',
+        '$CHROME_DIR/third_party/wtl/include',
+        '$NPAPI_DIR',
+        '$LIBXML_DIR/include',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$LIBPNG_DIR',
+        '$ZLIB_DIR',
+        '$BREAKPAD_DIR/src',
+        '$LIBJPEG_DIR',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '#/..',
+        '.',
+    ],
+    CPPDEFINES = [
+        "_LZMA_IN_CB",
+        "LIBXML_STATIC",
+        "PNG_USER_CONFIG",
+        "CHROME_PNG_WRITE_SUPPORT"
+        "U_STATIC_IMPLEMENTATION",
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+input_files = [
+    '../../app/google_update_settings$OBJSUFFIX',
+    'copy_tree_work_item.cc',
+    'create_dir_work_item.cc',
+    'create_reg_key_work_item.cc',
+    'delete_tree_work_item.cc',
+    'google_update_constants.cc',
+    'helper.cc',
+    'install_util.cc',
+    'l10n_string_util.cc',
+    'logging_installer.cc',
+    'lzma_util.cc',
+    'set_reg_value_work_item.cc',
+    'shell_util.cc',
+    'util_constants.cc',
+    'version.cc',
+    'work_item.cc',
+    'work_item_list.cc',
+]
+
+x = env.ChromeStaticLibrary('util', input_files)
+
+
+# create_string_rc.py imports FP.py from the tools/grit/grit/extern
+# directory, so add that to PYTHONPATH for this command execution.
+env_x = env.Clone()
+env_x.AppendENVPath('PYTHONPATH', [Dir('#/../tools/grit/grit/extern').abspath])
+env_x.Command(['$CHROME_DIR/installer/util/setup_strings.rc',
+               '$CHROME_DIR/installer/util/setup_strings.h'],
+              ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py',
+               '$CHROME_DIR/app/generated_resources.grd'] +
+               env.Glob('$CHROME_DIR/app/resources/*.xtb'),
+              "$PYTHON ${SOURCES[0]} ${TARGET.dir}")
diff --git a/chrome/plugin/SConscript b/chrome/plugin/SConscript
index 588d151..a2f6672 100644
--- a/chrome/plugin/SConscript
+++ b/chrome/plugin/SConscript
@@ -1,63 +1,63 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$NPAPI_DIR',
-        '$CHROME_DIR/tools/build/win',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-input_files = [
-    'chrome_plugin_host.cc',
-    'npobject_proxy.cc',
-    'npobject_stub.cc',
-    'npobject_util.cc',
-    'plugin_channel.cc',
-    'plugin_channel_base.cc',
-    'plugin_main.cc',
-    'plugin_process.cc',
-    'plugin_thread.cc',
-    'webplugin_delegate_stub.cc',
-    'webplugin_proxy.cc',
-]
-
-env.ChromeStaticLibrary('plugin', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '$NPAPI_DIR',
+        '$CHROME_DIR/tools/build/win',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+input_files = [
+    'chrome_plugin_host.cc',
+    'npobject_proxy.cc',
+    'npobject_stub.cc',
+    'npobject_util.cc',
+    'plugin_channel.cc',
+    'plugin_channel_base.cc',
+    'plugin_main.cc',
+    'plugin_process.cc',
+    'plugin_thread.cc',
+    'webplugin_delegate_stub.cc',
+    'webplugin_proxy.cc',
+]
+
+env.ChromeStaticLibrary('plugin', input_files)
diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
index ba25a7a..f801236 100644
--- a/chrome/renderer/SConscript
+++ b/chrome/renderer/SConscript
@@ -1,81 +1,81 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/app/resources',
-        '#/tools/build/win',
-        '#/..',
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-    ],
-    CCFLAGS = [
-        '/TP',
-    ],
-)
-
-env.Append(
-    CPPPATH = [
-        'third_party/wtl/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$NPAPI_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-    ],
-)
-
-input_files = [
-    'about_handler.cc',
-    'automation/dom_automation_controller.cc',
-    'debug_message_handler.cc',
-    'dom_ui_bindings.cc',
-    'external_js_object.cc',
-    'localized_error.cc',
-    'net/render_dns_master.cc',
-    'net/render_dns_queue.cc',
-    'plugin_channel_host.cc',
-    'render_process.cc',
-    'render_thread.cc',
-    'render_view.cc',
-    'render_widget.cc',
-    'renderer_glue.cc',
-    'renderer_main.cc',
-    'visitedlink_slave.cc',
-    'webplugin_delegate_proxy.cc',
-]
-
-env.ChromeStaticLibrary('renderer', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/app/resources',
+        '#/tools/build/win',
+        '#/..',
+    ],
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+    ],
+    CCFLAGS = [
+        '/TP',
+    ],
+)
+
+env.Append(
+    CPPPATH = [
+        'third_party/wtl/include',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '$NPAPI_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+    ],
+)
+
+input_files = [
+    'about_handler.cc',
+    'automation/dom_automation_controller.cc',
+    'debug_message_handler.cc',
+    'dom_ui_bindings.cc',
+    'external_js_object.cc',
+    'localized_error.cc',
+    'net/render_dns_master.cc',
+    'net/render_dns_queue.cc',
+    'plugin_channel_host.cc',
+    'render_process.cc',
+    'render_thread.cc',
+    'render_view.cc',
+    'render_widget.cc',
+    'renderer_glue.cc',
+    'renderer_main.cc',
+    'visitedlink_slave.cc',
+    'webplugin_delegate_proxy.cc',
+]
+
+env.ChromeStaticLibrary('renderer', input_files)
diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript
index 99c7950..9426dcc 100644
--- a/chrome/test/activex_test_control/SConscript
+++ b/chrome/test/activex_test_control/SConscript
@@ -1,73 +1,73 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '.',
-        '#/..',
-    ],
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/MANIFEST',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/DEBUG',
-    ],
-    LIBS = [
-        'comsuppw.lib',
-    ],
-)
-
-env.TypeLibrary('activex_test_control.idl')
-
-input_files = [
-    'activex_test_control.cc',
-    'activex_test_control.def',
-    'chrome_test_control.cc',
-]
-
-dll = env.ChromeSharedLibrary(['activex_test_control', 'activex_test_control.lib'],
-                        input_files)
-
-i = env.Install('$TARGET_ROOT', dll)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '.',
+        '#/..',
+    ],
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/MANIFEST',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/DEBUG',
+    ],
+    LIBS = [
+        'comsuppw.lib',
+    ],
+)
+
+env.TypeLibrary('activex_test_control.idl')
+
+input_files = [
+    'activex_test_control.cc',
+    'activex_test_control.def',
+    'chrome_test_control.cc',
+]
+
+dll = env.ChromeSharedLibrary(['activex_test_control', 'activex_test_control.lib'],
+                        input_files)
+
+i = env.Install('$TARGET_ROOT', dll)
+env.Alias('chrome', i)
diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript
index fb402ff..5cdb0f77 100644
--- a/chrome/test/automation/SConscript
+++ b/chrome/test/automation/SConscript
@@ -1,58 +1,58 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        #'../../..',
-        #'$GTEST_DIR/include',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-)
-
-input_files = [
-    'autocomplete_edit_proxy.cc',
-    'automation_handle_tracker.cc',
-    'automation_proxy.cc',
-    'browser_proxy.cc',
-    'constrained_window_proxy.cc',
-    'tab_proxy.cc',
-    'window_proxy.cc',
-]
-
-lib = env.ChromeStaticLibrary('automation', input_files)
-
-i = env.Install('$TARGET_ROOT', lib)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        #'../../..',
+        #'$GTEST_DIR/include',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+)
+
+input_files = [
+    'autocomplete_edit_proxy.cc',
+    'automation_handle_tracker.cc',
+    'automation_proxy.cc',
+    'browser_proxy.cc',
+    'constrained_window_proxy.cc',
+    'tab_proxy.cc',
+    'window_proxy.cc',
+]
+
+lib = env.ChromeStaticLibrary('automation', input_files)
+
+i = env.Install('$TARGET_ROOT', lib)
+env.Alias('chrome', i)
diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index dbec5a0..f9a7fdf 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -1,76 +1,76 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '#/..',
-    ],
-    LIBS = [
-        'googleurl',
-        'icuuc',
-        'base',
-    ],
-)
-
-env.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/MANIFEST',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/DEBUG',
-    ],
-    LIBS = [
-        'winmm.lib',
-    ],
-)
-
-input_files = [
-    'test_chrome_plugin.cc',
-    'test_chrome_plugin.def',
-]
-
-dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files)
-
-i = env.Install('$TARGET_ROOT', dll)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '#/..',
+    ],
+    LIBS = [
+        'googleurl',
+        'icuuc',
+        'base',
+    ],
+)
+
+env.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/MANIFEST',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/DEBUG',
+    ],
+    LIBS = [
+        'winmm.lib',
+    ],
+)
+
+input_files = [
+    'test_chrome_plugin.cc',
+    'test_chrome_plugin.def',
+]
+
+dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files)
+
+i = env.Install('$TARGET_ROOT', dll)
+env.Alias('chrome', i)
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index 113291f..65bd64f 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -1,112 +1,112 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-        'LIBXSLT_STATIC',
-        'LIBXML_STATIC',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-        '$CHROME_DIR/third_party/wtl/include',
-        '$LIBXSLT_DIR',
-        '$LIBXML_DIR/include',
-    ],
-    LIBS = [
-        'automation',
-        'base',
-        'base_gfx',
-        'browser',
-        'browser_views',
-        'bzip2',
-        'common',
-        'googleurl',
-        'gtest',
-        'icuuc',
-        'libpng',
-        'modp_b64',
-        'net',
-        'skia',
-        'zlib',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'psapi.lib',
-        'rpcrt4.lib',
-        'winmm.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/browser/browser_focus_uitest.cc',
-    '$CHROME_DIR/browser/tabs/tab_dragging_test.cc',
-    '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-]
-
-exe = env_test.ChromeTestProgram(['interactive_ui_tests',
-                        'interactive_ui_tests.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+        'LIBXSLT_STATIC',
+        'LIBXML_STATIC',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+        '$CHROME_DIR/third_party/wtl/include',
+        '$LIBXSLT_DIR',
+        '$LIBXML_DIR/include',
+    ],
+    LIBS = [
+        'automation',
+        'base',
+        'base_gfx',
+        'browser',
+        'browser_views',
+        'bzip2',
+        'common',
+        'googleurl',
+        'gtest',
+        'icuuc',
+        'libpng',
+        'modp_b64',
+        'net',
+        'skia',
+        'zlib',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'comsupp.lib',
+        'oleacc.lib',
+        'psapi.lib',
+        'rpcrt4.lib',
+        'winmm.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/browser/browser_focus_uitest.cc',
+    '$CHROME_DIR/browser/tabs/tab_dragging_test.cc',
+    '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+]
+
+exe = env_test.ChromeTestProgram(['interactive_ui_tests',
+                        'interactive_ui_tests.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript
index 7e113cd..f3cf77c 100644
--- a/chrome/test/memory_test/SConscript
+++ b/chrome/test/memory_test/SConscript
@@ -1,98 +1,98 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    LIBS = [
-        'automation',
-        'base',
-        'base_gfx',
-        'browser',
-        'browser_views',
-        'common',
-        'googleurl',
-        'gtest',
-        'icuuc',
-        'libpng',
-        'net',
-        'skia',
-        'zlib',
-    ],
-)
-
-if env_test['PLATFORM'] == 'win32':
-  env_test.Prepend(
-      LINKFLAGS = [
-          '/INCREMENTAL',
-          '/DEBUG',
-
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-
-          '/MACHINE:X86',
-          '/FIXED:No',
-
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
-  )
-
-input_files = [
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'memory_test.cc',
-]
-
-exe = env_test.ChromeTestProgram(['memory_test',
-                                  'memory_test.pdb'],
-                                 input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    LIBS = [
+        'automation',
+        'base',
+        'base_gfx',
+        'browser',
+        'browser_views',
+        'common',
+        'googleurl',
+        'gtest',
+        'icuuc',
+        'libpng',
+        'net',
+        'skia',
+        'zlib',
+    ],
+)
+
+if env_test['PLATFORM'] == 'win32':
+  env_test.Prepend(
+      LINKFLAGS = [
+          '/INCREMENTAL',
+          '/DEBUG',
+
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
+
+          '/MACHINE:X86',
+          '/FIXED:No',
+
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
+      ],
+  )
+
+input_files = [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'memory_test.cc',
+]
+
+exe = env_test.ChromeTestProgram(['memory_test',
+                                  'memory_test.pdb'],
+                                 input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index 0aa72c3..40f1032 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -1,90 +1,90 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-
-env_test = env_test.Clone()
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '#/..',
-    ],
-    LIBS = [
-        'util',
-        'gtest',
-        'icuuc',
-        'base',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'rpcrt4.lib',
-        'shlwapi.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
-    '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
-    'chrome_mini_installer.cc',
-    'mini_installer_test_constants.cc',
-    'test.cc',
-]
-
-exe = env_test.ChromeTestProgram(['mini_installer_test',
-                        'mini_installer_test.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+
+env_test = env_test.Clone()
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '#/..',
+    ],
+    LIBS = [
+        'util',
+        'gtest',
+        'icuuc',
+        'base',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'comsupp.lib',
+        'oleacc.lib',
+        'rpcrt4.lib',
+        'shlwapi.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
+    '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
+    'chrome_mini_installer.cc',
+    'mini_installer_test_constants.cc',
+    'test.cc',
+]
+
+exe = env_test.ChromeTestProgram(['mini_installer_test',
+                        'mini_installer_test.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index a21feaa..03bc415 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -1,106 +1,106 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    LIBS = [
-        'googleurl',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        'icuuc',
-        'common',
-        'zlib',
-        'modp_b64',
-        'browser',
-        'browser_views',
-        'net',
-        'base',
-        'automation',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'psapi.lib',
-        'rpcrt4.lib',
-        'winmm.lib',
-    ],
-)
-
-
-input_files = [
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'page_cycler_test.cc',
-]
-
-exe = env_test.ChromeTestProgram(['page_cycler_tests',
-                        'page_cycler_tests.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    LIBS = [
+        'googleurl',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'modp_b64',
+        'browser',
+        'browser_views',
+        'net',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'comsupp.lib',
+        'oleacc.lib',
+        'psapi.lib',
+        'rpcrt4.lib',
+        'winmm.lib',
+    ],
+)
+
+
+input_files = [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'page_cycler_test.cc',
+]
+
+exe = env_test.ChromeTestProgram(['page_cycler_tests',
+                        'page_cycler_tests.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 806b5b8..74973b0 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -1,110 +1,110 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-        'LIBXSLT_STATIC',
-        'LIBXML_STATIC',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-        '$LIBXSLT_DIR',
-        '$LIBXML_DIR/includ',
-    ],
-    LIBS = [
-        'googleurl',
-        'security_tests',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        'icuuc',
-        'common',
-        'zlib',
-        'modp_b64',
-        'browser',
-        'browser_views',
-        'net',
-        'base',
-        'automation',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"ws2_32.dll"',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-         'comsupp.lib',
-         'oleacc.lib',
-         'rpcrt4.lib',
-         'winmm.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'plugin_test.cpp',
-]
-
-
-exe = env_test.ChromeTestProgram(['plugin_tests',
-                        'plugin_tests.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+        'LIBXSLT_STATIC',
+        'LIBXML_STATIC',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+        '$LIBXSLT_DIR',
+        '$LIBXML_DIR/includ',
+    ],
+    LIBS = [
+        'googleurl',
+        'security_tests',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'modp_b64',
+        'browser',
+        'browser_views',
+        'net',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"ws2_32.dll"',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+         'comsupp.lib',
+         'oleacc.lib',
+         'rpcrt4.lib',
+         'winmm.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'plugin_test.cpp',
+]
+
+
+exe = env_test.ChromeTestProgram(['plugin_tests',
+                        'plugin_tests.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index deb2b50..7ad6b99 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -1,104 +1,104 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'RELIABILITY_TEST',     # seems to be unused
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    LIBS = [
-        'googleurl',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        'icuuc',
-        'common',
-        'zlib',
-        'browser',
-        'browser_views',
-        'base',
-        'automation',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'psapi.lib',
-        'rpcrt4.lib',
-        'winmm.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'page_load_test.cc',
-    'run_all_unittests.cc',
-]
-
-exe = env_test.ChromeTestProgram(['reliability_tests',
-                        'reliability_tests.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'RELIABILITY_TEST',     # seems to be unused
+        'UI_TEST',
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    LIBS = [
+        'googleurl',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'browser',
+        'browser_views',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'comsupp.lib',
+        'oleacc.lib',
+        'psapi.lib',
+        'rpcrt4.lib',
+        'winmm.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'page_load_test.cc',
+    'run_all_unittests.cc',
+]
+
+exe = env_test.ChromeTestProgram(['reliability_tests',
+                        'reliability_tests.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index 27a3eed..d074c99 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -1,79 +1,79 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '#/..',
-    ],
-)
-
-env.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/MANIFEST',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/DEBUG',
-    ],
-    LIBS = [
-        'DelayImp.lib',
-    ],
-)
-
-input_files = [
-    'ipc_security_tests.cc',
-    'security_tests.cc',
-    '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',
-]
-
-dll = env.ChromeSharedLibrary(['security_tests',
-                               'security_tests.lib',
-                               'security_tests.ilk',
-                               'security_tests.pdb'],
-                              input_files)
-
-# TODO(sgk):  can go away once ChromeSharedLibrary() handles this.
-env.Install('$LIBS_DIR', dll[1])
-
-i = env.Install('$TARGET_ROOT', dll)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '#/..',
+    ],
+)
+
+env.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/MANIFEST',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/DEBUG',
+    ],
+    LIBS = [
+        'DelayImp.lib',
+    ],
+)
+
+input_files = [
+    'ipc_security_tests.cc',
+    'security_tests.cc',
+    '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',
+]
+
+dll = env.ChromeSharedLibrary(['security_tests',
+                               'security_tests.lib',
+                               'security_tests.ilk',
+                               'security_tests.pdb'],
+                              input_files)
+
+# TODO(sgk):  can go away once ChromeSharedLibrary() handles this.
+env.Install('$LIBS_DIR', dll[1])
+
+i = env.Install('$TARGET_ROOT', dll)
+env.Alias('chrome', i)
diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index 31785a1..92100a7 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -1,102 +1,102 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    LIBS = [
-        'googleurl',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        'icuuc',
-        'common',
-        'zlib',
-        'modp_b64',
-        'browser',
-        'browser_views',
-        'net',
-        'base',
-        'automation',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'winmm.lib',
-        'rpcrt4.lib',
-        'oleacc.lib',
-        'comsupp.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'selenium_test.cc',
-]
-
-exe = env_test.ChromeTestProgram(['selenium_tests',
-                        'selenium_tests.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    LIBS = [
+        'googleurl',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'modp_b64',
+        'browser',
+        'browser_views',
+        'net',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'winmm.lib',
+        'rpcrt4.lib',
+        'oleacc.lib',
+        'comsupp.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'selenium_test.cc',
+]
+
+exe = env_test.ChromeTestProgram(['selenium_tests',
+                        'selenium_tests.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 4cce677..b0cc678 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -1,101 +1,101 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    LIBS = [
-        'googleurl',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        'icuuc',
-        'common',
-        'zlib',
-        'browser',
-        'browser_views',
-        'base',
-        'automation',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'winmm.lib',
-        'rpcrt4.lib',
-        'oleacc.lib',
-        'comsupp.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'feature_startup_test.cc',
-    'startup_test.cc',
-]
-
-exe = env_test.ChromeTestProgram(['startup_tests',
-                        'startup_tests.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    LIBS = [
+        'googleurl',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'browser',
+        'browser_views',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'winmm.lib',
+        'rpcrt4.lib',
+        'oleacc.lib',
+        'comsupp.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'feature_startup_test.cc',
+    'startup_test.cc',
+]
+
+exe = env_test.ChromeTestProgram(['startup_tests',
+                        'startup_tests.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index d5fc7e7..4f82fa0 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -1,105 +1,105 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '#/..',
-    ],
-    LIBS = [
-        'googleurl',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        'icuuc',
-        'common',
-        'zlib',
-        'modp_b64',
-        'browser',
-        'browser_views',
-        'net',
-        'base',
-        'automation',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'winmm.lib',
-        'psapi.lib',
-        'rpcrt4.lib',
-        'oleacc.lib',
-        'comsupp.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'tab_switching_test.cc',
-]
-
-#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"
-
-exe = env_test.ChromeTestProgram(['tab_switching_test',
-                        'tab_switching_test.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+        'UNIT_TEST',
+    ],
+    CPPPATH = [
+        '$GTEST_DIR/include',
+        '$GTEST_DIR',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '#/..',
+    ],
+    LIBS = [
+        'googleurl',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'modp_b64',
+        'browser',
+        'browser_views',
+        'net',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'winmm.lib',
+        'psapi.lib',
+        'rpcrt4.lib',
+        'oleacc.lib',
+        'comsupp.lib',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'tab_switching_test.cc',
+]
+
+#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"
+
+exe = env_test.ChromeTestProgram(['tab_switching_test',
+                        'tab_switching_test.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript
index ff4153f..d55c592 100644
--- a/chrome/third_party/hunspell/SConscript
+++ b/chrome/third_party/hunspell/SConscript
@@ -1,81 +1,81 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Copyright 2008 Google Inc. All Rights Reserved.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$ICU38_DIR/public/common',
-        '#/..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'W32',
-        'OPENOFFICEORG',
-        'CHROME_SPELL',
-        'HUNSPELL_CHROME_CLIENT',
-    ],
-
-    CCFLAGS = [
-        '/TP',
-
-        '/wd4800',
-    ],
-)
-
-input_files = [
-    'google/bdict_reader.cc',
-    'src/hunspell/affentry.cxx',
-    'src/hunspell/affixmgr.cxx',
-    'src/hunspell/csutil.cxx',
-    'src/hunspell/dictmgr.cxx',
-    'src/hunspell/hashmgr.cxx',
-    'src/hunspell/hunspell.cxx',
-    'src/hunspell/suggestmgr.cxx',
-    'src/parsers/textparser.cxx',
-]
-
-env.ChromeStaticLibrary('hunspell', input_files)
-
-
-
-dictionaries = [
-    'dictionaries/en-US.bdic',
-    'dictionaries/en-US.dic',
-    'dictionaries/en-US.aff',
-]
-
-i = env.Install('$TARGET_ROOT/Dictionaries', dictionaries)
-env.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Copyright 2008 Google Inc. All Rights Reserved.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$ICU38_DIR/public/common',
+        '#/..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'W32',
+        'OPENOFFICEORG',
+        'CHROME_SPELL',
+        'HUNSPELL_CHROME_CLIENT',
+    ],
+
+    CCFLAGS = [
+        '/TP',
+
+        '/wd4800',
+    ],
+)
+
+input_files = [
+    'google/bdict_reader.cc',
+    'src/hunspell/affentry.cxx',
+    'src/hunspell/affixmgr.cxx',
+    'src/hunspell/csutil.cxx',
+    'src/hunspell/dictmgr.cxx',
+    'src/hunspell/hashmgr.cxx',
+    'src/hunspell/hunspell.cxx',
+    'src/hunspell/suggestmgr.cxx',
+    'src/parsers/textparser.cxx',
+]
+
+env.ChromeStaticLibrary('hunspell', input_files)
+
+
+
+dictionaries = [
+    'dictionaries/en-US.bdic',
+    'dictionaries/en-US.dic',
+    'dictionaries/en-US.aff',
+]
+
+i = env.Install('$TARGET_ROOT/Dictionaries', dictionaries)
+env.Alias('chrome', i)
diff --git a/chrome/third_party/sqlite/SConscript b/chrome/third_party/sqlite/SConscript
index e04381a..6d45a34 100644
--- a/chrome/third_party/sqlite/SConscript
+++ b/chrome/third_party/sqlite/SConscript
@@ -1,119 +1,119 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Copyright 2008 Google Inc. All Rights Reserved.
-
-Import('env')
-
-env = env.Clone(
-)
-
-env.Prepend(
-    CPPPATH = [
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-
-        'SQLITE_ENABLE_FTS2',
-        'SQLITE_ENABLE_BROKEN_FTS2',
-        'SQLITE_ENABLE_ICU',
-        'SQLITE_SECURE_DELETE',
-        'THREADSAFE',
-        ['_HAS_EXCEPTIONS', '0'],
-    ],
-
-    CCFLAGS = [
-        '/TC',
-
-        '/wd4800',
-        '/wd4244',
-    ],
-)
-
-input_files = [
-    'alter.c',
-    'analyze.c',
-    'attach.c',
-    'auth.c',
-    'btree.c',
-    'build.c',
-    'callback.c',
-    'complete.c',
-    'date.c',
-    'delete.c',
-    'expr.c',
-    'fts2.c',
-    'fts2_hash.c',
-    'fts2_icu.c',
-    'fts2_porter.c',
-    'fts2_tokenizer.c',
-    'fts2_tokenizer1.c',
-    'func.c',
-    'hash.c',
-    'icu.c',
-    'insert.c',
-    'legacy.c',
-    'loadext.c',
-    'main.c',
-    'malloc.c',
-    'opcodes.c',
-    'os.c',
-    'os_win.c',
-    'pager.c',
-    'parse.c',
-    'pragma.c',
-    'prepare.c',
-    'printf.c',
-    'random.c',
-    'select.c',
-    'shell.c',
-    'shell_icu.c',
-    'table.c',
-    'tokenize.c',
-    'trigger.c',
-    'update.c',
-    'utf.c',
-    'util.c',
-    'vacuum.c',
-    'vdbe.c',
-    'vdbeapi.c',
-    'vdbeaux.c',
-    'vdbefifo.c',
-    'vdbemem.c',
-    'vtab.c',
-    'where.c',
-]
-
-env.ChromeStaticLibrary('sqlite', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Copyright 2008 Google Inc. All Rights Reserved.
+
+Import('env')
+
+env = env.Clone(
+)
+
+env.Prepend(
+    CPPPATH = [
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+
+        'SQLITE_ENABLE_FTS2',
+        'SQLITE_ENABLE_BROKEN_FTS2',
+        'SQLITE_ENABLE_ICU',
+        'SQLITE_SECURE_DELETE',
+        'THREADSAFE',
+        ['_HAS_EXCEPTIONS', '0'],
+    ],
+
+    CCFLAGS = [
+        '/TC',
+
+        '/wd4800',
+        '/wd4244',
+    ],
+)
+
+input_files = [
+    'alter.c',
+    'analyze.c',
+    'attach.c',
+    'auth.c',
+    'btree.c',
+    'build.c',
+    'callback.c',
+    'complete.c',
+    'date.c',
+    'delete.c',
+    'expr.c',
+    'fts2.c',
+    'fts2_hash.c',
+    'fts2_icu.c',
+    'fts2_porter.c',
+    'fts2_tokenizer.c',
+    'fts2_tokenizer1.c',
+    'func.c',
+    'hash.c',
+    'icu.c',
+    'insert.c',
+    'legacy.c',
+    'loadext.c',
+    'main.c',
+    'malloc.c',
+    'opcodes.c',
+    'os.c',
+    'os_win.c',
+    'pager.c',
+    'parse.c',
+    'pragma.c',
+    'prepare.c',
+    'printf.c',
+    'random.c',
+    'select.c',
+    'shell.c',
+    'shell_icu.c',
+    'table.c',
+    'tokenize.c',
+    'trigger.c',
+    'update.c',
+    'utf.c',
+    'util.c',
+    'vacuum.c',
+    'vdbe.c',
+    'vdbeapi.c',
+    'vdbeaux.c',
+    'vdbefifo.c',
+    'vdbemem.c',
+    'vtab.c',
+    'where.c',
+]
+
+env.ChromeStaticLibrary('sqlite', input_files)
diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript
index 260f7bf..d650ced 100644
--- a/chrome/tools/crash_service/SConscript
+++ b/chrome/tools/crash_service/SConscript
@@ -1,78 +1,78 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$BREAKPAD_DIR/src',
-        '#/..',
-    ],
-    LIBS = [
-        'base',
-        'base_gfx',
-        'breakpad_handler',
-        'breakpad_sender',
-        'common',
-        'icuuc',
-        'skia',
-        'zlib',
-    ],
-)
-
-env.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/DEBUG',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-    ],
-)
-
-input_files = [
-    'main.cc',
-    'crash_service.cc',
-]
-
-exe = env.ChromeProgram('crash_service.exe', input_files)
-
-i = env.Install('$TARGET_ROOT', exe)
-Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$BREAKPAD_DIR/src',
+        '#/..',
+    ],
+    LIBS = [
+        'base',
+        'base_gfx',
+        'breakpad_handler',
+        'breakpad_sender',
+        'common',
+        'icuuc',
+        'skia',
+        'zlib',
+    ],
+)
+
+env.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/DEBUG',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+    ],
+)
+
+input_files = [
+    'main.cc',
+    'crash_service.cc',
+]
+
+exe = env.ChromeProgram('crash_service.exe', input_files)
+
+i = env.Install('$TARGET_ROOT', exe)
+Alias('chrome', i)
diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript
index 0173e16..c0b6fa3 100644
--- a/chrome/tools/perf/flush_cache/SConscript
+++ b/chrome/tools/perf/flush_cache/SConscript
@@ -1,72 +1,72 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPPATH = [
-        '#/..',
-    ],
-    LIBS = [
-        'icuuc',
-        'base',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'flush_cache.cc',
-]
-
-exe = env_test.ChromeTestProgram(['flush_cache',
-                        'flush_cache'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+env_test.Prepend(
+    CPPPATH = [
+        '#/..',
+    ],
+    LIBS = [
+        'icuuc',
+        'base',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
+
+input_files = [
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'flush_cache.cc',
+]
+
+exe = env_test.ChromeTestProgram(['flush_cache',
+                        'flush_cache'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index 01d293b..55584dd 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -1,84 +1,84 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-        '_DEBUG',
-    ],
-    CPPPATH = [
-        '$ZLIB_DIR',
-        '$LIBPNG_DIR',
-        '#/..',
-    ],
-    LIBS = [
-        'skia',
-        'libpng',
-        'base_gfx',
-        'icuuc',
-        'zlib',
-        'base',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/SUBSYSTEM:CONSOLE',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
-
-input_files = [
-    'image_diff.cc',
-]
-
-exe = env_test.ChromeTestProgram(['image_diff',
-                        'image_diff.pdb'],
-                       input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env_test')
+
+env_test = env_test.Clone()
+
+env_test.Prepend(
+    CPPDEFINES = [
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+        '_DEBUG',
+    ],
+    CPPPATH = [
+        '$ZLIB_DIR',
+        '$LIBPNG_DIR',
+        '#/..',
+    ],
+    LIBS = [
+        'skia',
+        'libpng',
+        'base_gfx',
+        'icuuc',
+        'zlib',
+        'base',
+    ],
+)
+
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
+
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+
+        '/SUBSYSTEM:CONSOLE',
+
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
+
+input_files = [
+    'image_diff.cc',
+]
+
+exe = env_test.ChromeTestProgram(['image_diff',
+                        'image_diff.pdb'],
+                       input_files)
+i = env_test.Install('$TARGET_ROOT', exe)
+
+env_test.Alias('chrome', i)
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index bff655c..eb5a380 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -1,117 +1,117 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/tools/build/win',
-        '#/..',
-    ],
-    CCFLAGS = [
-        '/TP',
-        #'/Wp64',
-    ],
-)
-
-env.Append(
-    CPPPATH = [
-        '../app/resources',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/include/platform',
-        'third_party/wtl/include',
-    ],
-)
-
-input_files = [
-    'accelerator.cc',
-    'accelerator_handler.cc',
-    'accessibility/accessible_wrapper.cc',
-    'accessibility/autocomplete_accessibility.cc',
-    'accessibility/view_accessibility.cc',
-    'aero_tooltip_manager.cc',
-    'background.cc',
-    'base_button.cc',
-    'bitmap_scroll_bar.cc',
-    'border.cc',
-    'button.cc',
-    'button_dropdown.cc',
-    'checkbox.cc',
-    'chrome_menu.cc',
-    'client_view.cc',
-    'combo_box.cc',
-    'custom_frame_window.cc',
-    'dialog_client_view.cc',
-    'decision.cc',
-    'event.cc',
-    'external_focus_tracker.cc',
-    'focus_manager.cc',
-    # This was in the Visual Studio build, but seems unnecessary.
-    #'focus_manager_unittest.cc',
-    'grid_layout.cc',
-    'group_table_view.cc',
-    'hwnd_view.cc',
-    'hwnd_view_container.cc',
-    'image_view.cc',
-    'label.cc',
-    'layout_manager.cc',
-    'link.cc',
-    'menu.cc',
-    'menu_button.cc',
-    'message_box_view.cc',
-    'native_button.cc',
-    'native_control.cc',
-    'native_scroll_bar.cc',
-    'non_client_view.cc',
-    'painter.cc',
-    'radio_button.cc',
-    'repeat_controller.cc',
-    'resize_corner.cc',
-    'root_view.cc',
-    'root_view_drop_target.cc',
-    'scroll_bar.cc',
-    'scroll_view.cc',
-    'separator.cc',
-    'tabbed_pane.cc',
-    'table_view.cc',
-    'text_button.cc',
-    'text_field.cc',
-    'throbber.cc',
-    'tooltip_manager.cc',
-    'tree_view.cc',
-    'view.cc',
-    'view_storage.cc',
-    'window.cc',
-]
-
-env.ChromeStaticLibrary('views', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/tools/build/win',
+        '#/..',
+    ],
+    CCFLAGS = [
+        '/TP',
+        #'/Wp64',
+    ],
+)
+
+env.Append(
+    CPPPATH = [
+        '../app/resources',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/include/platform',
+        'third_party/wtl/include',
+    ],
+)
+
+input_files = [
+    'accelerator.cc',
+    'accelerator_handler.cc',
+    'accessibility/accessible_wrapper.cc',
+    'accessibility/autocomplete_accessibility.cc',
+    'accessibility/view_accessibility.cc',
+    'aero_tooltip_manager.cc',
+    'background.cc',
+    'base_button.cc',
+    'bitmap_scroll_bar.cc',
+    'border.cc',
+    'button.cc',
+    'button_dropdown.cc',
+    'checkbox.cc',
+    'chrome_menu.cc',
+    'client_view.cc',
+    'combo_box.cc',
+    'custom_frame_window.cc',
+    'dialog_client_view.cc',
+    'decision.cc',
+    'event.cc',
+    'external_focus_tracker.cc',
+    'focus_manager.cc',
+    # This was in the Visual Studio build, but seems unnecessary.
+    #'focus_manager_unittest.cc',
+    'grid_layout.cc',
+    'group_table_view.cc',
+    'hwnd_view.cc',
+    'hwnd_view_container.cc',
+    'image_view.cc',
+    'label.cc',
+    'layout_manager.cc',
+    'link.cc',
+    'menu.cc',
+    'menu_button.cc',
+    'message_box_view.cc',
+    'native_button.cc',
+    'native_control.cc',
+    'native_scroll_bar.cc',
+    'non_client_view.cc',
+    'painter.cc',
+    'radio_button.cc',
+    'repeat_controller.cc',
+    'resize_corner.cc',
+    'root_view.cc',
+    'root_view_drop_target.cc',
+    'scroll_bar.cc',
+    'scroll_view.cc',
+    'separator.cc',
+    'tabbed_pane.cc',
+    'table_view.cc',
+    'text_button.cc',
+    'text_field.cc',
+    'throbber.cc',
+    'tooltip_manager.cc',
+    'tree_view.cc',
+    'view.cc',
+    'view_storage.cc',
+    'window.cc',
+]
+
+env.ChromeStaticLibrary('views', input_files)
diff --git a/google_update/SConscript b/google_update/SConscript
index 3307232..0b30575 100644
--- a/google_update/SConscript
+++ b/google_update/SConscript
@@ -1,32 +1,32 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env.TypeLibrary('google_update_idl')
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env.TypeLibrary('google_update_idl')
diff --git a/net/SConscript b/net/SConscript
index 109543d..e0be0a7 100644
--- a/net/SConscript
+++ b/net/SConscript
@@ -1,320 +1,320 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env_res = env.Clone()
-env_tests = env.Clone()
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$ZLIB_DIR',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-    ],
-    CCFLAGS = [
-        '/Wp64',
-    ],
-)
-
-input_files = [
-    'base/address_list.cc',
-    'base/auth_cache.cc',
-    'base/base64.cc',
-    'base/bzip2_filter.cc',
-    'base/client_socket_factory.cc',
-    'base/client_socket_handle.cc',
-    'base/client_socket_pool.cc',
-    'base/cookie_monster.cc',
-    'base/cookie_policy.cc',
-    'base/data_url.cc',
-    'base/directory_lister.cc',
-    'base/dns_resolution_observer.cc',
-    'base/escape.cc',
-    'base/ev_root_ca_metadata.cc',
-    'base/filter.cc',
-    'base/gzip_filter.cc',
-    'base/gzip_header.cc',
-    'base/host_resolver.cc',
-    'base/listen_socket.cc',
-    'base/mime_sniffer.cc',
-    'base/mime_util.cc',
-    'base/net_errors.cc',
-    'base/net_module.cc',
-    'base/net_util.cc',
-    'base/platform_mime_util_win.cc',
-    'base/registry_controlled_domain.cc',
-    'base/ssl_client_socket.cc',
-    'base/ssl_config_service.cc',
-    'base/tcp_client_socket.cc',
-    'base/telnet_server.cc',
-    'base/upload_data.cc',
-    'base/upload_data_stream.cc',
-    'base/wininet_util.cc',
-    'base/winsock_init.cc',
-    'base/x509_certificate.cc',
-    'disk_cache/backend_impl.cc',
-    'disk_cache/block_files.cc',
-    'disk_cache/entry_impl.cc',
-    'disk_cache/file.cc',
-    'disk_cache/file_lock.cc',
-    'disk_cache/hash.cc',
-    'disk_cache/mapped_file.cc',
-    'disk_cache/mem_backend_impl.cc',
-    'disk_cache/mem_entry_impl.cc',
-    'disk_cache/mem_rankings.cc',
-    'disk_cache/rankings.cc',
-    'disk_cache/stats.cc',
-    'disk_cache/trace.cc',
-    'http/cert_status_cache.cc',
-    'http/http_chunked_decoder.cc',
-    'http/http_cache.cc',
-    'http/http_network_layer.cc',
-    'http/http_network_transaction.cc',
-    'http/http_response_headers.cc',
-    'http/http_transaction_winhttp.cc',
-    'http/http_util.cc',
-    'http/http_vary_data.cc',
-    'http/winhttp_request_throttle.cc',
-    'proxy/proxy_resolver_fixed.cc',
-    'proxy/proxy_resolver_winhttp.cc',
-    'proxy/proxy_service.cc',
-    'url_request/mime_sniffer_proxy.cc',
-    'url_request/url_request.cc',
-    'url_request/url_request_about_job.cc',
-    'url_request/url_request_error_job.cc',
-    'url_request/url_request_file_dir_job.cc',
-    'url_request/url_request_file_job.cc',
-    'url_request/url_request_filter.cc',
-    'url_request/url_request_ftp_job.cc',
-    'url_request/url_request_http_job.cc',
-    'url_request/url_request_inet_job.cc',
-    'url_request/url_request_job.cc',
-    'url_request/url_request_job_manager.cc',
-    'url_request/url_request_job_metrics.cc',
-    'url_request/url_request_job_tracker.cc',
-    'url_request/url_request_simple_job.cc',
-    'url_request/url_request_test_job.cc',
-    'url_request/url_request_view_cache_job.cc',
-]
-
-#env_p = env.Clone(
-#    PCHSTOP='precompiled_net.h',
-#    PDB = 'vc80.pdb',
-#)
-#pch, obj = env_p.PCH(['net.pch', 'precompiled_net.obj'], 'precompiled_net.cc')
-#env_p['PCH'] = pch
-
-#env.ChromeStaticLibrary('net', input_files + [obj])
-
-# TODO(bradnelson): This step generates file precompiled_net.pch.ib_tag
-#                   possibly only on incredibuild, scons doesn't know this.
-env_p = env.Clone()
-env_p.Append(CCFLAGS='/Ylnet')
-pch, obj = env_p.PCH('precompiled_net.pch', 'build/precompiled_net.cc')
-env['PCH'] = pch
-env['PCHSTOP'] = 'precompiled_net.h'
-env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h'])
-
-env.ChromeStaticLibrary('net', input_files + [obj])
-
-
-env_tests.Prepend(
-    CPPPATH = [
-        '..',
-    ],
-    CPPDEFINES = [
-        'UNIT_TEST',
-        '_WIN32_WINNT=0x0600',
-        'WINVER=0x0600',
-        '_HAS_EXCEPTIONS=0',
-    ],
-    LIBS = [
-        'googleurl',
-        'base',
-        'gtest',
-        'bzip2',
-        'icuuc',
-        'modp_b64',
-        'zlib',
-        'net',
-    ]
-)
-
-env_tests.Prepend(
-    CCFLAGS = [
-        '/TP',
-        '/WX',
-        '/Wp64',
-    ],
-    LINKFLAGS = [
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
-
-env_tests.Append(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-    ],
-)
-
-
-unittest_files = [
-    'base/auth_cache_unittest.cc',
-    'base/base64_unittest.cc',
-    'base/bzip2_filter_unittest.cc',
-    'base/client_socket_pool_unittest.cc',
-    'base/cookie_monster_unittest.cc',
-    'base/cookie_policy_unittest.cc',
-    'base/data_url_unittest.cc',
-    'base/directory_lister_unittest.cc',
-    'base/escape_unittest.cc',
-    'base/gzip_filter_unittest.cc',
-    'base/mime_sniffer_unittest.cc',
-    'base/mime_util_unittest.cc',
-    'base/net_util_unittest.cc',
-    'base/registry_controlled_domain_unittest.cc',
-    'base/ssl_config_service_unittest.cc',
-    'base/ssl_client_socket_unittest.cc',
-    'base/tcp_client_socket_unittest.cc',
-    'base/wininet_util_unittest.cc',
-    'disk_cache/addr_unittest.cc',
-    'disk_cache/backend_unittest.cc',
-    'disk_cache/block_files_unittest.cc',
-    'disk_cache/disk_cache_test_base.cc',
-    'disk_cache/disk_cache_test_util.cc',
-    'disk_cache/entry_unittest.cc',
-    'disk_cache/mapped_file_unittest.cc',
-    'disk_cache/storage_block_unittest.cc',
-    'http/http_cache_unittest.cc',
-    'http/http_network_layer_unittest.cc',
-    'http/http_network_transaction_unittest.cc',
-    'http/http_response_headers_unittest.cc',
-    'http/http_transaction_unittest.cc',
-    'http/http_transaction_winhttp_unittest.cc',
-    'http/http_util_unittest.cc',
-    'http/http_vary_data_unittest.cc',
-    'http/winhttp_request_throttle_unittest.cc',
-    'url_request/url_request_unittest.cc',
-    '$BASE_DIR/run_all_unittests.obj',
-]
-
-net_unittests = env_tests.ChromeTestProgram(
-    ['net_unittests.exe',
-    'net_unittests.ilk',
-    'net_unittests.pdb'],
-    unittest_files
-)
-
-
-
-stress_cache = env_tests.ChromeTestProgram(
-    ['stress_cache.exe',
-    'stress_cache.ilk',
-    'stress_cache.pdb'],
-    ['disk_cache/stress_cache.cc',
-    'disk_cache/disk_cache_test_util.cc']
-)
-
-
-crash_cache = env_tests.ChromeTestProgram(
-    ['crash_cache.exe',
-    'crash_cache.ilk',
-    'crash_cache.pdb'],
-    ['tools/crash_cache/crash_cache.cc',
-    'disk_cache/disk_cache_test_util.cc']
-)
-
-
-net_perftests = env_tests.ChromeTestProgram(
-    ['net_perftests.exe',
-    'net_perftests.ilk',
-    'net_perftests.pdb'],
-    ['disk_cache/disk_cache_test_util.cc',
-    'disk_cache/disk_cache_perftest.cc',
-    'base/cookie_monster_perftest.cc',
-    # TODO(sgk): avoid using .cc from base directly
-    '$BASE_DIR/run_all_perftests$OBJSUFFIX',
-    '$BASE_DIR/perftimer$OBJSUFFIX']
-)
-
-
-# Create install of tests.
-installed_tests = env.Install(
-  '$TARGET_ROOT',
-  net_unittests + stress_cache + crash_cache + net_perftests
-)
-
-
-env_res.Append(
-    CPPPATH = [
-        '..',
-    ],
-    RCFLAGS = [
-        ['/l', '0x409'],
-    ],
-)
-
-# This dat file needed by net_resources is generated.
-tld_names_clean = env_res.Command('net/effective_tld_names_clean.dat',
-                                 ['base/effective_tld_names.dat',
-                                  'tools/tld_cleanup/tld_cleanup.exe'],
-                                 '${SOURCES[1]} ${SOURCES[0]} $TARGET')
-rc = env_res.Command('net_resources.rc',
-                     'base/net_resources.rc',
-                     Copy('$TARGET', '$SOURCE'))
-net_resources = env_res.RES(rc)
-env_res.Depends(rc, tld_names_clean)
-
-
-sconscript_files = [
-    'tools/tld_cleanup/SConscript',
-]
-
-SConscript(sconscript_files, exports=['env'])
-
-
-# Setup alias for building all parts of net.
-env.Alias('net', ['.', installed_tests, '../icudt38.dll'])
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env_res = env.Clone()
+env_tests = env.Clone()
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$ZLIB_DIR',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+    ],
+    CCFLAGS = [
+        '/Wp64',
+    ],
+)
+
+input_files = [
+    'base/address_list.cc',
+    'base/auth_cache.cc',
+    'base/base64.cc',
+    'base/bzip2_filter.cc',
+    'base/client_socket_factory.cc',
+    'base/client_socket_handle.cc',
+    'base/client_socket_pool.cc',
+    'base/cookie_monster.cc',
+    'base/cookie_policy.cc',
+    'base/data_url.cc',
+    'base/directory_lister.cc',
+    'base/dns_resolution_observer.cc',
+    'base/escape.cc',
+    'base/ev_root_ca_metadata.cc',
+    'base/filter.cc',
+    'base/gzip_filter.cc',
+    'base/gzip_header.cc',
+    'base/host_resolver.cc',
+    'base/listen_socket.cc',
+    'base/mime_sniffer.cc',
+    'base/mime_util.cc',
+    'base/net_errors.cc',
+    'base/net_module.cc',
+    'base/net_util.cc',
+    'base/platform_mime_util_win.cc',
+    'base/registry_controlled_domain.cc',
+    'base/ssl_client_socket.cc',
+    'base/ssl_config_service.cc',
+    'base/tcp_client_socket.cc',
+    'base/telnet_server.cc',
+    'base/upload_data.cc',
+    'base/upload_data_stream.cc',
+    'base/wininet_util.cc',
+    'base/winsock_init.cc',
+    'base/x509_certificate.cc',
+    'disk_cache/backend_impl.cc',
+    'disk_cache/block_files.cc',
+    'disk_cache/entry_impl.cc',
+    'disk_cache/file.cc',
+    'disk_cache/file_lock.cc',
+    'disk_cache/hash.cc',
+    'disk_cache/mapped_file.cc',
+    'disk_cache/mem_backend_impl.cc',
+    'disk_cache/mem_entry_impl.cc',
+    'disk_cache/mem_rankings.cc',
+    'disk_cache/rankings.cc',
+    'disk_cache/stats.cc',
+    'disk_cache/trace.cc',
+    'http/cert_status_cache.cc',
+    'http/http_chunked_decoder.cc',
+    'http/http_cache.cc',
+    'http/http_network_layer.cc',
+    'http/http_network_transaction.cc',
+    'http/http_response_headers.cc',
+    'http/http_transaction_winhttp.cc',
+    'http/http_util.cc',
+    'http/http_vary_data.cc',
+    'http/winhttp_request_throttle.cc',
+    'proxy/proxy_resolver_fixed.cc',
+    'proxy/proxy_resolver_winhttp.cc',
+    'proxy/proxy_service.cc',
+    'url_request/mime_sniffer_proxy.cc',
+    'url_request/url_request.cc',
+    'url_request/url_request_about_job.cc',
+    'url_request/url_request_error_job.cc',
+    'url_request/url_request_file_dir_job.cc',
+    'url_request/url_request_file_job.cc',
+    'url_request/url_request_filter.cc',
+    'url_request/url_request_ftp_job.cc',
+    'url_request/url_request_http_job.cc',
+    'url_request/url_request_inet_job.cc',
+    'url_request/url_request_job.cc',
+    'url_request/url_request_job_manager.cc',
+    'url_request/url_request_job_metrics.cc',
+    'url_request/url_request_job_tracker.cc',
+    'url_request/url_request_simple_job.cc',
+    'url_request/url_request_test_job.cc',
+    'url_request/url_request_view_cache_job.cc',
+]
+
+#env_p = env.Clone(
+#    PCHSTOP='precompiled_net.h',
+#    PDB = 'vc80.pdb',
+#)
+#pch, obj = env_p.PCH(['net.pch', 'precompiled_net.obj'], 'precompiled_net.cc')
+#env_p['PCH'] = pch
+
+#env.ChromeStaticLibrary('net', input_files + [obj])
+
+# TODO(bradnelson): This step generates file precompiled_net.pch.ib_tag
+#                   possibly only on incredibuild, scons doesn't know this.
+env_p = env.Clone()
+env_p.Append(CCFLAGS='/Ylnet')
+pch, obj = env_p.PCH('precompiled_net.pch', 'build/precompiled_net.cc')
+env['PCH'] = pch
+env['PCHSTOP'] = 'precompiled_net.h'
+env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h'])
+
+env.ChromeStaticLibrary('net', input_files + [obj])
+
+
+env_tests.Prepend(
+    CPPPATH = [
+        '..',
+    ],
+    CPPDEFINES = [
+        'UNIT_TEST',
+        '_WIN32_WINNT=0x0600',
+        'WINVER=0x0600',
+        '_HAS_EXCEPTIONS=0',
+    ],
+    LIBS = [
+        'googleurl',
+        'base',
+        'gtest',
+        'bzip2',
+        'icuuc',
+        'modp_b64',
+        'zlib',
+        'net',
+    ]
+)
+
+env_tests.Prepend(
+    CCFLAGS = [
+        '/TP',
+        '/WX',
+        '/Wp64',
+    ],
+    LINKFLAGS = [
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
+
+env_tests.Append(
+    CPPPATH = [
+        '$GTEST_DIR/include',
+    ],
+)
+
+
+unittest_files = [
+    'base/auth_cache_unittest.cc',
+    'base/base64_unittest.cc',
+    'base/bzip2_filter_unittest.cc',
+    'base/client_socket_pool_unittest.cc',
+    'base/cookie_monster_unittest.cc',
+    'base/cookie_policy_unittest.cc',
+    'base/data_url_unittest.cc',
+    'base/directory_lister_unittest.cc',
+    'base/escape_unittest.cc',
+    'base/gzip_filter_unittest.cc',
+    'base/mime_sniffer_unittest.cc',
+    'base/mime_util_unittest.cc',
+    'base/net_util_unittest.cc',
+    'base/registry_controlled_domain_unittest.cc',
+    'base/ssl_config_service_unittest.cc',
+    'base/ssl_client_socket_unittest.cc',
+    'base/tcp_client_socket_unittest.cc',
+    'base/wininet_util_unittest.cc',
+    'disk_cache/addr_unittest.cc',
+    'disk_cache/backend_unittest.cc',
+    'disk_cache/block_files_unittest.cc',
+    'disk_cache/disk_cache_test_base.cc',
+    'disk_cache/disk_cache_test_util.cc',
+    'disk_cache/entry_unittest.cc',
+    'disk_cache/mapped_file_unittest.cc',
+    'disk_cache/storage_block_unittest.cc',
+    'http/http_cache_unittest.cc',
+    'http/http_network_layer_unittest.cc',
+    'http/http_network_transaction_unittest.cc',
+    'http/http_response_headers_unittest.cc',
+    'http/http_transaction_unittest.cc',
+    'http/http_transaction_winhttp_unittest.cc',
+    'http/http_util_unittest.cc',
+    'http/http_vary_data_unittest.cc',
+    'http/winhttp_request_throttle_unittest.cc',
+    'url_request/url_request_unittest.cc',
+    '$BASE_DIR/run_all_unittests.obj',
+]
+
+net_unittests = env_tests.ChromeTestProgram(
+    ['net_unittests.exe',
+    'net_unittests.ilk',
+    'net_unittests.pdb'],
+    unittest_files
+)
+
+
+
+stress_cache = env_tests.ChromeTestProgram(
+    ['stress_cache.exe',
+    'stress_cache.ilk',
+    'stress_cache.pdb'],
+    ['disk_cache/stress_cache.cc',
+    'disk_cache/disk_cache_test_util.cc']
+)
+
+
+crash_cache = env_tests.ChromeTestProgram(
+    ['crash_cache.exe',
+    'crash_cache.ilk',
+    'crash_cache.pdb'],
+    ['tools/crash_cache/crash_cache.cc',
+    'disk_cache/disk_cache_test_util.cc']
+)
+
+
+net_perftests = env_tests.ChromeTestProgram(
+    ['net_perftests.exe',
+    'net_perftests.ilk',
+    'net_perftests.pdb'],
+    ['disk_cache/disk_cache_test_util.cc',
+    'disk_cache/disk_cache_perftest.cc',
+    'base/cookie_monster_perftest.cc',
+    # TODO(sgk): avoid using .cc from base directly
+    '$BASE_DIR/run_all_perftests$OBJSUFFIX',
+    '$BASE_DIR/perftimer$OBJSUFFIX']
+)
+
+
+# Create install of tests.
+installed_tests = env.Install(
+  '$TARGET_ROOT',
+  net_unittests + stress_cache + crash_cache + net_perftests
+)
+
+
+env_res.Append(
+    CPPPATH = [
+        '..',
+    ],
+    RCFLAGS = [
+        ['/l', '0x409'],
+    ],
+)
+
+# This dat file needed by net_resources is generated.
+tld_names_clean = env_res.Command('net/effective_tld_names_clean.dat',
+                                 ['base/effective_tld_names.dat',
+                                  'tools/tld_cleanup/tld_cleanup.exe'],
+                                 '${SOURCES[1]} ${SOURCES[0]} $TARGET')
+rc = env_res.Command('net_resources.rc',
+                     'base/net_resources.rc',
+                     Copy('$TARGET', '$SOURCE'))
+net_resources = env_res.RES(rc)
+env_res.Depends(rc, tld_names_clean)
+
+
+sconscript_files = [
+    'tools/tld_cleanup/SConscript',
+]
+
+SConscript(sconscript_files, exports=['env'])
+
+
+# Setup alias for building all parts of net.
+env.Alias('net', ['.', installed_tests, '../icudt38.dll'])
+
diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript
index 4a0ca47..9ea10462 100644
--- a/net/tools/tld_cleanup/SConscript
+++ b/net/tools/tld_cleanup/SConscript
@@ -1,79 +1,79 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '../../..',
-    ],
-    LIBS = [
-      'googleurl',
-      'icuuc',
-      'base',
-      # We only need to link with net due to use precompiled_net.pch.
-      'net',
-    ],
-)
-
-env.Append(
-    CCFLAGS = [
-        '/TP',
-    ],
-
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/MANIFEST',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/DEBUG',
-        '/SUBSYSTEM:CONSOLE',
-        '/MACHINE:X86',
-        '/FIXED:No',
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
-
-input_files = [
-    'tld_cleanup.cc',
-]
-
-exe_targets = env.ChromeProgram(['tld_cleanup',
-                           'tld_cleanup.ilk',
-                           'tld_cleanup.pdb'],
-                          input_files)
-i = env.Install('$TARGET_ROOT', exe_targets)
-env.Alias('net', i)
-
-env.Install('$TARGET_ROOT', exe_targets)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '../../..',
+    ],
+    LIBS = [
+      'googleurl',
+      'icuuc',
+      'base',
+      # We only need to link with net due to use precompiled_net.pch.
+      'net',
+    ],
+)
+
+env.Append(
+    CCFLAGS = [
+        '/TP',
+    ],
+
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/MANIFEST',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/DEBUG',
+        '/SUBSYSTEM:CONSOLE',
+        '/MACHINE:X86',
+        '/FIXED:No',
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
+
+input_files = [
+    'tld_cleanup.cc',
+]
+
+exe_targets = env.ChromeProgram(['tld_cleanup',
+                           'tld_cleanup.ilk',
+                           'tld_cleanup.pdb'],
+                          input_files)
+i = env.Install('$TARGET_ROOT', exe_targets)
+env.Alias('net', i)
+
+env.Install('$TARGET_ROOT', exe_targets)
diff --git a/rlz/SConscript b/rlz/SConscript
index 16c24c3..021f8c0 100644
--- a/rlz/SConscript
+++ b/rlz/SConscript
@@ -1,34 +1,34 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env.Install('$TARGET_ROOT',
-            ['binaries/rlz.dll',
-             'binaries/rlz_dll.pdb'])
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env.Install('$TARGET_ROOT',
+            ['binaries/rlz.dll',
+             'binaries/rlz_dll.pdb'])
diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript
index 986a783..e327c2d 100644
--- a/sandbox/src/SConscript
+++ b/sandbox/src/SConscript
@@ -1,297 +1,297 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '../..',
-    ],
-)
-
-# Some of the sandbox sources include "gtest.h", so we need it
-# in the base env here, not just in env_tests.
-env.Append(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-    ],
-)
-
-env.Append(
-    CCFLAGS = [
-        '/TP',
-        '/WX',          # treat warnings as errors
-        '/Wp64',        # warn about potential 64-bit problems
-    ],
-)
-
-env_tests = env.Clone(
-    TESTS_DIR = '../tests',
-    INTEGRATION_TESTS_DIR = '$TESTS_DIR/integration_tests',
-    UNIT_TESTS_DIR = '$TESTS_DIR/unit_tests',
-    VALIDATION_TESTS_DIR = '$TESTS_DIR/validation_tests',
-)
-
-
-input_files = [
-    'Wow64.cc',
-    'acl.cc',
-    'broker_services.cc',
-    'crosscall_server.cc',
-    'dep.cc',
-    'eat_resolver.cc',
-    'filesystem_dispatcher.cc',
-    'filesystem_interception.cc',
-    'filesystem_policy.cc',
-    'interception.cc',
-    'interception_agent.cc',
-    'job.cc',
-    'named_pipe_dispatcher.cc',
-    'named_pipe_interception.cc',
-    'named_pipe_policy.cc',
-    'pe_image.cc',
-    'policy_broker.cc',
-    'policy_engine_opcodes.cc',
-    'policy_engine_processor.cc',
-    'policy_low_level.cc',
-    'policy_target.cc',
-    'process_thread_dispatcher.cc',
-    'process_thread_interception.cc',
-    'process_thread_policy.cc',
-    'registry_dispatcher.cc',
-    'registry_interception.cc',
-    'registry_policy.cc',
-    'resolver.cc',
-    'restricted_token.cc',
-    'restricted_token_utils.cc',
-    'sandbox.cc',
-    'sandbox_nt_util.cc',
-    'sandbox_policy_base.cc',
-    'sandbox_utils.cc',
-    'service_resolver.cc',
-    'shared_handles.cc',
-    'sharedmem_ipc_client.cc',
-    'sharedmem_ipc_server.cc',
-    'sid.cc',
-    'sidestep/ia32_modrm_map.cpp',
-    'sidestep/ia32_opcode_map.cpp',
-    'sidestep/mini_disassembler.cpp',
-    'sidestep/preamble_patcher_with_stub.cpp',
-    'sidestep_resolver.cc',
-    'sync_dispatcher.cc',
-    'sync_interception.cc',
-    'sync_policy.cc',
-    'target_interceptions.cc',
-    'target_process.cc',
-    'target_services.cc',
-    'win2k_threadpool.cc',
-    'win_utils.cc',
-]
-
-
-# TODO(bradnelson): This step generates sandbox.pch.ib_tag
-#                   SCons doesn't know.
-env_p = env.Clone()
-env_p.Append(CCFLAGS='/Ylsandbox')
-pch, obj = env_p.PCH(['sandbox.pch', 'stdafx.obj'], 'stdafx.cc')
-env['PCH'] = pch
-env['PCHSTOP'] = 'stdafx.h'
-env.Append(CCPCHFLAGS = ['/FIstdafx.h'])
-
-
-env.ChromeStaticLibrary('sandbox', input_files + [obj])
-
-
-env_tests.Prepend(
-    LINKFLAGS = [
-        '/DELAYLOAD:dwmapi.dll',
-        '/DELAYLOAD:uxtheme.dll',
-        '/MACHINE:X86',
-        '/FIXED:No',
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'base',
-        'gtest',
-        'sandbox',
-    ],
-    LIBPATH = [
-        '.',
-        '$BASE_DIR'
-    ],
-)
-
-controller_obj = env_tests.StaticObject('$TESTS_DIR/common/controller.cc')
-
-
-# Unit Tests
-
-env_unit_tests = env_tests.Clone()
-
-unit_test_files = [
-    'interception_unittest.cc',
-    'ipc_unittest.cc',
-    'job_unittest.cc',
-    'pe_image_unittest.cc',
-    'policy_engine_unittest.cc',
-    'policy_low_level_unittest.cc',
-    'policy_opcodes_unittest.cc',
-    'restricted_token_unittest.cc',
-    'service_resolver_unittest.cc',
-    'sid_unittest.cc',
-    'threadpool_unittest.cc',
-
-    '$UNIT_TESTS_DIR/unit_tests$OBJSUFFIX',
-    # The VisualStudio build link with the old gtest.obj file directly,
-    # although we no longer remember why.  Since we're linking with all
-    # of gtest.lib now, this shouldn't be necessary (hey, the unit tests
-    # all pass!), but we're leaving this here, commented out, just in case.
-    #'$GTEST_DIR/src/gtest$OBJSUFFIX',
-    controller_obj,
-]
-
-
-# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag
-#                   SCons doesn't know.
-env_p = env_unit_tests.Clone()
-pch, obj = env_p.PCH(['$UNIT_TESTS_DIR/unit_tests.pch',
-                      '$UNIT_TESTS_DIR/unit_tests.obj'],
-                     '$UNIT_TESTS_DIR/unit_tests.cc')
-env_unit_tests['PCH'] = pch
-env_unit_tests['PCHSTOP'] = 'stdafx.h'
-env_unit_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
-
-
-unit_tests = env_unit_tests.ChromeTestProgram(
-    ['../sbox_unittests.exe',
-    '../sbox_unittests.ilk',
-    '../sbox_unittests.pdb'],
-    unit_test_files,
-)
-
-
-# Integration Tests
-
-env_integration_tests = env_tests.Clone()
-
-integration_test_files = [
-    '$INTEGRATION_TESTS_DIR/integration_tests_test.cc',
-#    'dep_test.cc',
-    'file_policy_test.cc',
-    'integrity_level_test.cc',
-    'ipc_ping_test.cc',
-    'named_pipe_policy_test.cc',
-    'policy_target_test.cc',
-    'process_policy_test.cc',
-    'registry_policy_test.cc',
-    'sync_policy_test.cc',
-
-    '$INTEGRATION_TESTS_DIR/integration_tests$OBJSUFFIX',
-    # The VisualStudio build link with the old gtest.obj file directly,
-    # although we no longer remember why.  Since we're linking with all
-    # of gtest.lib now, this shouldn't be necessary (hey, the unit tests
-    # all pass!), but we're leaving this here, commented out, just in case.
-    #'$GTEST_DIR/src/gtest$OBJSUFFIX',
-    controller_obj,
-]
-
-
-# TODO(bradnelson): This step generates integration_tests.pch.ib_tag
-#                   SCons doesn't know.
-env_p = env_integration_tests.Clone()
-pch, obj = env_p.PCH(['$INTEGRATION_TESTS_DIR/integration_tests.pch',
-                      '$INTEGRATION_TESTS_DIR/integration_tests.obj'],
-                     '$INTEGRATION_TESTS_DIR/integration_tests.cc')
-env_integration_tests['PCH'] = pch
-env_integration_tests['PCHSTOP'] = 'stdafx.h'
-env_integration_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
-
-integration_tests = env_integration_tests.ChromeTestProgram(
-    ['../sbox_integration_tests.exe',
-    '../sbox_integration_tests.ilk',
-    '../sbox_integration_tests.lib',
-    '../sbox_integration_tests.exp',
-    '../sbox_integration_tests.pdb'],
-    integration_test_files,
-)
-
-
-# Validation Tests #
-
-env_validation_tests = env_tests.Clone()
-
-env_validation_tests.Prepend(LIBS=['shlwapi.lib'])
-
-validation_test_files = [
-    '$VALIDATION_TESTS_DIR/suite.cc',
-    '$VALIDATION_TESTS_DIR/commands.cc',
-    '$VALIDATION_TESTS_DIR/unit_tests$OBJSUFFIX',
-    # The VisualStudio build link with the old gtest.obj file directly,
-    # although we no longer remember why.  Since we're linking with all
-    # of gtest.lib now, this shouldn't be necessary (hey, the unit tests
-    # all pass!), but we're leaving this here, commented out, just in case.
-    #'$GTEST_DIR/src/gtest$OBJSUFFIX',
-    controller_obj,
-]
-
-env_p = env_validation_tests.Clone()
-
-# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag
-#                   SCons doesn't know.
-pch, obj = env_p.PCH(['$VALIDATION_TESTS_DIR/unit_tests.pch',
-                      '$VALIDATION_TESTS_DIR/unit_tests.obj'],
-                     '$VALIDATION_TESTS_DIR/unit_tests.cc')
-env_validation_tests['PCH'] = pch
-env_validation_tests['PCHSTOP'] = 'stdafx.h'
-env_validation_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
-
-validation_tests = env_validation_tests.ChromeTestProgram(
-    ['../sbox_validation_tests.exe',
-    '../sbox_validation_tests.ilk',
-    '../sbox_validation_tests.lib',
-    '../sbox_validation_tests.exp',
-    '../sbox_validation_tests.pdb'],
-    validation_test_files,
-)
-
-
-# Install tests to a path where they can find their inputs.
-installed_tests = env.Install('$OBJ_ROOT',
-    unit_tests + validation_tests + integration_tests)
-
-
-# Setup alias for sandbox related targets.
-env.Alias('sandbox', ['.', installed_tests])
-
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '../..',
+    ],
+)
+
+# Some of the sandbox sources include "gtest.h", so we need it
+# in the base env here, not just in env_tests.
+env.Append(
+    CPPPATH = [
+        '$GTEST_DIR/include',
+    ],
+)
+
+env.Append(
+    CCFLAGS = [
+        '/TP',
+        '/WX',          # treat warnings as errors
+        '/Wp64',        # warn about potential 64-bit problems
+    ],
+)
+
+env_tests = env.Clone(
+    TESTS_DIR = '../tests',
+    INTEGRATION_TESTS_DIR = '$TESTS_DIR/integration_tests',
+    UNIT_TESTS_DIR = '$TESTS_DIR/unit_tests',
+    VALIDATION_TESTS_DIR = '$TESTS_DIR/validation_tests',
+)
+
+
+input_files = [
+    'Wow64.cc',
+    'acl.cc',
+    'broker_services.cc',
+    'crosscall_server.cc',
+    'dep.cc',
+    'eat_resolver.cc',
+    'filesystem_dispatcher.cc',
+    'filesystem_interception.cc',
+    'filesystem_policy.cc',
+    'interception.cc',
+    'interception_agent.cc',
+    'job.cc',
+    'named_pipe_dispatcher.cc',
+    'named_pipe_interception.cc',
+    'named_pipe_policy.cc',
+    'pe_image.cc',
+    'policy_broker.cc',
+    'policy_engine_opcodes.cc',
+    'policy_engine_processor.cc',
+    'policy_low_level.cc',
+    'policy_target.cc',
+    'process_thread_dispatcher.cc',
+    'process_thread_interception.cc',
+    'process_thread_policy.cc',
+    'registry_dispatcher.cc',
+    'registry_interception.cc',
+    'registry_policy.cc',
+    'resolver.cc',
+    'restricted_token.cc',
+    'restricted_token_utils.cc',
+    'sandbox.cc',
+    'sandbox_nt_util.cc',
+    'sandbox_policy_base.cc',
+    'sandbox_utils.cc',
+    'service_resolver.cc',
+    'shared_handles.cc',
+    'sharedmem_ipc_client.cc',
+    'sharedmem_ipc_server.cc',
+    'sid.cc',
+    'sidestep/ia32_modrm_map.cpp',
+    'sidestep/ia32_opcode_map.cpp',
+    'sidestep/mini_disassembler.cpp',
+    'sidestep/preamble_patcher_with_stub.cpp',
+    'sidestep_resolver.cc',
+    'sync_dispatcher.cc',
+    'sync_interception.cc',
+    'sync_policy.cc',
+    'target_interceptions.cc',
+    'target_process.cc',
+    'target_services.cc',
+    'win2k_threadpool.cc',
+    'win_utils.cc',
+]
+
+
+# TODO(bradnelson): This step generates sandbox.pch.ib_tag
+#                   SCons doesn't know.
+env_p = env.Clone()
+env_p.Append(CCFLAGS='/Ylsandbox')
+pch, obj = env_p.PCH(['sandbox.pch', 'stdafx.obj'], 'stdafx.cc')
+env['PCH'] = pch
+env['PCHSTOP'] = 'stdafx.h'
+env.Append(CCPCHFLAGS = ['/FIstdafx.h'])
+
+
+env.ChromeStaticLibrary('sandbox', input_files + [obj])
+
+
+env_tests.Prepend(
+    LINKFLAGS = [
+        '/DELAYLOAD:dwmapi.dll',
+        '/DELAYLOAD:uxtheme.dll',
+        '/MACHINE:X86',
+        '/FIXED:No',
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+    LIBS = [
+        'base',
+        'gtest',
+        'sandbox',
+    ],
+    LIBPATH = [
+        '.',
+        '$BASE_DIR'
+    ],
+)
+
+controller_obj = env_tests.StaticObject('$TESTS_DIR/common/controller.cc')
+
+
+# Unit Tests
+
+env_unit_tests = env_tests.Clone()
+
+unit_test_files = [
+    'interception_unittest.cc',
+    'ipc_unittest.cc',
+    'job_unittest.cc',
+    'pe_image_unittest.cc',
+    'policy_engine_unittest.cc',
+    'policy_low_level_unittest.cc',
+    'policy_opcodes_unittest.cc',
+    'restricted_token_unittest.cc',
+    'service_resolver_unittest.cc',
+    'sid_unittest.cc',
+    'threadpool_unittest.cc',
+
+    '$UNIT_TESTS_DIR/unit_tests$OBJSUFFIX',
+    # The VisualStudio build link with the old gtest.obj file directly,
+    # although we no longer remember why.  Since we're linking with all
+    # of gtest.lib now, this shouldn't be necessary (hey, the unit tests
+    # all pass!), but we're leaving this here, commented out, just in case.
+    #'$GTEST_DIR/src/gtest$OBJSUFFIX',
+    controller_obj,
+]
+
+
+# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag
+#                   SCons doesn't know.
+env_p = env_unit_tests.Clone()
+pch, obj = env_p.PCH(['$UNIT_TESTS_DIR/unit_tests.pch',
+                      '$UNIT_TESTS_DIR/unit_tests.obj'],
+                     '$UNIT_TESTS_DIR/unit_tests.cc')
+env_unit_tests['PCH'] = pch
+env_unit_tests['PCHSTOP'] = 'stdafx.h'
+env_unit_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
+
+
+unit_tests = env_unit_tests.ChromeTestProgram(
+    ['../sbox_unittests.exe',
+    '../sbox_unittests.ilk',
+    '../sbox_unittests.pdb'],
+    unit_test_files,
+)
+
+
+# Integration Tests
+
+env_integration_tests = env_tests.Clone()
+
+integration_test_files = [
+    '$INTEGRATION_TESTS_DIR/integration_tests_test.cc',
+#    'dep_test.cc',
+    'file_policy_test.cc',
+    'integrity_level_test.cc',
+    'ipc_ping_test.cc',
+    'named_pipe_policy_test.cc',
+    'policy_target_test.cc',
+    'process_policy_test.cc',
+    'registry_policy_test.cc',
+    'sync_policy_test.cc',
+
+    '$INTEGRATION_TESTS_DIR/integration_tests$OBJSUFFIX',
+    # The VisualStudio build link with the old gtest.obj file directly,
+    # although we no longer remember why.  Since we're linking with all
+    # of gtest.lib now, this shouldn't be necessary (hey, the unit tests
+    # all pass!), but we're leaving this here, commented out, just in case.
+    #'$GTEST_DIR/src/gtest$OBJSUFFIX',
+    controller_obj,
+]
+
+
+# TODO(bradnelson): This step generates integration_tests.pch.ib_tag
+#                   SCons doesn't know.
+env_p = env_integration_tests.Clone()
+pch, obj = env_p.PCH(['$INTEGRATION_TESTS_DIR/integration_tests.pch',
+                      '$INTEGRATION_TESTS_DIR/integration_tests.obj'],
+                     '$INTEGRATION_TESTS_DIR/integration_tests.cc')
+env_integration_tests['PCH'] = pch
+env_integration_tests['PCHSTOP'] = 'stdafx.h'
+env_integration_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
+
+integration_tests = env_integration_tests.ChromeTestProgram(
+    ['../sbox_integration_tests.exe',
+    '../sbox_integration_tests.ilk',
+    '../sbox_integration_tests.lib',
+    '../sbox_integration_tests.exp',
+    '../sbox_integration_tests.pdb'],
+    integration_test_files,
+)
+
+
+# Validation Tests #
+
+env_validation_tests = env_tests.Clone()
+
+env_validation_tests.Prepend(LIBS=['shlwapi.lib'])
+
+validation_test_files = [
+    '$VALIDATION_TESTS_DIR/suite.cc',
+    '$VALIDATION_TESTS_DIR/commands.cc',
+    '$VALIDATION_TESTS_DIR/unit_tests$OBJSUFFIX',
+    # The VisualStudio build link with the old gtest.obj file directly,
+    # although we no longer remember why.  Since we're linking with all
+    # of gtest.lib now, this shouldn't be necessary (hey, the unit tests
+    # all pass!), but we're leaving this here, commented out, just in case.
+    #'$GTEST_DIR/src/gtest$OBJSUFFIX',
+    controller_obj,
+]
+
+env_p = env_validation_tests.Clone()
+
+# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag
+#                   SCons doesn't know.
+pch, obj = env_p.PCH(['$VALIDATION_TESTS_DIR/unit_tests.pch',
+                      '$VALIDATION_TESTS_DIR/unit_tests.obj'],
+                     '$VALIDATION_TESTS_DIR/unit_tests.cc')
+env_validation_tests['PCH'] = pch
+env_validation_tests['PCHSTOP'] = 'stdafx.h'
+env_validation_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
+
+validation_tests = env_validation_tests.ChromeTestProgram(
+    ['../sbox_validation_tests.exe',
+    '../sbox_validation_tests.ilk',
+    '../sbox_validation_tests.lib',
+    '../sbox_validation_tests.exp',
+    '../sbox_validation_tests.pdb'],
+    validation_test_files,
+)
+
+
+# Install tests to a path where they can find their inputs.
+installed_tests = env.Install('$OBJ_ROOT',
+    unit_tests + validation_tests + integration_tests)
+
+
+# Setup alias for sandbox related targets.
+env.Alias('sandbox', ['.', installed_tests])
+
+
diff --git a/skia/SConscript b/skia/SConscript
index 54cf1de..4c66ae9 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -1,193 +1,193 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        'include',
-        'include/corecg',
-        'corecg',
-        'sgl',
-        'picture',
-        '#..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'SKIA_DISABLE_SUPPORT_FOR_DECODERS',
-    ],
-
-    CCFLAGS = [
-        '/TP',
-
-        '/wd4244',
-        '/wd4267',
-        '/wd4345',
-        '/wd4390',
-        '/wd4554',
-        '/wd4800',
-    ],
-)
-
-
-input_files = [
-    'animator/SkTime.cpp',
-    'corecg/Sk64.cpp',
-    'corecg/SkBuffer.cpp',
-    'corecg/SkChunkAlloc.cpp',
-    'corecg/SkCordic.cpp',
-    'corecg/SkDebug.cpp',
-    'corecg/SkDebug_stdio.cpp',
-    'corecg/SkFloat.cpp',
-    'corecg/SkInterpolator.cpp',
-    'corecg/SkMath.cpp',
-    'corecg/SkMatrix.cpp',
-    'corecg/SkMemory_stdlib.cpp',
-    'corecg/SkPoint.cpp',
-    'corecg/SkRect.cpp',
-    'corecg/SkRegion.cpp',
-    'effects/Sk1DPathEffect.cpp',
-    'effects/Sk2DPathEffect.cpp',
-    'effects/SkAvoidXfermode.cpp',
-    'effects/SkBlurDrawLooper.cpp',
-    'effects/SkBlurMask.cpp',
-    'effects/SkBlurMaskFilter.cpp',
-    'effects/SkCamera.cpp',
-    'effects/SkColorFilters.cpp',
-    'effects/SkColorMatrix.cpp',
-    'effects/SkColorMatrixFilter.cpp',
-    'effects/SkCornerPathEffect.cpp',
-    'effects/SkCullPoints.cpp',
-    'effects/SkDashPathEffect.cpp',
-    'effects/SkDiscretePathEffect.cpp',
-    'effects/SkEmbossMask.cpp',
-    'effects/SkEmbossMaskFilter.cpp',
-    'effects/SkGradientShader.cpp',
-    'effects/SkKernel33MaskFilter.cpp',
-    'effects/SkLayerRasterizer.cpp',
-    'effects/SkPaintFlagsDrawFilter.cpp',
-    'effects/SkPixelXorXfermode.cpp',
-    'effects/SkShaderExtras.cpp',
-    'effects/SkTransparentShader.cpp',
-    'effects/SkUnitMappers.cpp',
-    'images/SkImageDecoder.cpp',
-    'images/SkImageRef.cpp',
-    'images/SkStream.cpp',
-    'images/SkStream.cpp',
-    'picture/SkPictureFlat.cpp',
-    'picture/SkPicturePlayback.cpp',
-    'picture/SkPictureRecord.cpp',
-    'ports/SkFontHost_none.cpp',
-    'ports/SkGlobals_global.cpp',
-    'ports/SkImageDecoder_Factory.cpp',
-    'ports/SkOSFile_stdio.cpp',
-    'ports/SkThread_win.cpp',
-    'sgl/SkAlphaRuns.cpp',
-    'sgl/SkBitmap.cpp',
-    'sgl/SkBitmapProcShader.cpp',
-    'sgl/SkBitmapProcState.cpp',
-    'sgl/SkBitmapProcState_matrixProcs.cpp',
-    'sgl/SkBitmapSampler.cpp',
-    'sgl/SkBitmapShader.cpp',
-    'sgl/SkBlitRow_D16.cpp',
-    'sgl/SkBlitRow_D4444.cpp',
-    'sgl/SkBlitter.cpp',
-    'sgl/SkBlitter_4444.cpp',
-    'sgl/SkBlitter_A1.cpp',
-    'sgl/SkBlitter_A8.cpp',
-    'sgl/SkBlitter_ARGB32.cpp',
-    'sgl/SkBlitter_RGB16.cpp',
-    'sgl/SkBlitter_Sprite.cpp',
-    'sgl/SkCanvas.cpp',
-    'sgl/SkColor.cpp',
-    'sgl/SkColorFilter.cpp',
-    'sgl/SkColorTable.cpp',
-    'sgl/SkDeque.cpp',
-    'sgl/SkDevice.cpp',
-    'sgl/SkDither.cpp',
-    'sgl/SkDraw.cpp',
-    'sgl/SkEdge.cpp',
-    'sgl/SkFilterProc.cpp',
-    'sgl/SkFlattenable.cpp',
-    'sgl/SkGeometry.cpp',
-    'sgl/SkGlobals.cpp',
-    'sgl/SkGlyphCache.cpp',
-    'sgl/SkGraphics.cpp',
-    'sgl/SkMask.cpp',
-    'sgl/SkMaskFilter.cpp',
-    'sgl/SkPackBits.cpp',
-    'sgl/SkPaint.cpp',
-    'sgl/SkPath.cpp',
-    'sgl/SkPathEffect.cpp',
-    'sgl/SkPathMeasure.cpp',
-    'sgl/SkPicture.cpp',
-    'sgl/SkPixelRef.cpp',
-    'sgl/SkProcSpriteBlitter.cpp',
-    'sgl/SkPtrRecorder.cpp',
-    'sgl/SkRasterizer.cpp',
-    'sgl/SkRefCnt.cpp',
-    'sgl/SkRegion_path.cpp',
-    'sgl/SkScalerContext.cpp',
-    'sgl/SkScan.cpp',
-    'sgl/SkScan_Antihair.cpp',
-    'sgl/SkScan_AntiPath.cpp',
-    'sgl/SkScan_Hairline.cpp',
-    'sgl/SkScan_Path.cpp',
-    'sgl/SkShader.cpp',
-    'sgl/SkSpriteBlitter_ARGB32.cpp',
-    'sgl/SkSpriteBlitter_RGB16.cpp',
-    'sgl/SkString.cpp',
-    'sgl/SkStroke.cpp',
-    'sgl/SkStrokerPriv.cpp',
-    'sgl/SkTSearch.cpp',
-    'sgl/SkTypeface_fake.cpp',
-    'sgl/SkUtils.cpp',
-    'sgl/SkWriter32.cpp',
-    'sgl/SkXfermode.cpp',
-]
-
-env_p = env.Clone(
-    PCHSTOP = 'SkTypes.h',
-    PDB = 'vc80.pdb',
-)
-
-# TODO(rspangler): This step forces -Zi, but doesn't actually use it.  Need to
-# fix so it doesn't override our -Z7.  -Zi also causes vc80.pdb to be created
-# in the skia directory.
-# TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. 
-# It's a 0-length file so likely harmless.  Is this a side effect of having
-# IncrediBuild installed on the build machine?
-pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')
-env_p['PCH'] = pch
-
-env.ChromeStaticLibrary('skia', input_files + [obj])
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        'include',
+        'include/corecg',
+        'corecg',
+        'sgl',
+        'picture',
+        '#..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'SKIA_DISABLE_SUPPORT_FOR_DECODERS',
+    ],
+
+    CCFLAGS = [
+        '/TP',
+
+        '/wd4244',
+        '/wd4267',
+        '/wd4345',
+        '/wd4390',
+        '/wd4554',
+        '/wd4800',
+    ],
+)
+
+
+input_files = [
+    'animator/SkTime.cpp',
+    'corecg/Sk64.cpp',
+    'corecg/SkBuffer.cpp',
+    'corecg/SkChunkAlloc.cpp',
+    'corecg/SkCordic.cpp',
+    'corecg/SkDebug.cpp',
+    'corecg/SkDebug_stdio.cpp',
+    'corecg/SkFloat.cpp',
+    'corecg/SkInterpolator.cpp',
+    'corecg/SkMath.cpp',
+    'corecg/SkMatrix.cpp',
+    'corecg/SkMemory_stdlib.cpp',
+    'corecg/SkPoint.cpp',
+    'corecg/SkRect.cpp',
+    'corecg/SkRegion.cpp',
+    'effects/Sk1DPathEffect.cpp',
+    'effects/Sk2DPathEffect.cpp',
+    'effects/SkAvoidXfermode.cpp',
+    'effects/SkBlurDrawLooper.cpp',
+    'effects/SkBlurMask.cpp',
+    'effects/SkBlurMaskFilter.cpp',
+    'effects/SkCamera.cpp',
+    'effects/SkColorFilters.cpp',
+    'effects/SkColorMatrix.cpp',
+    'effects/SkColorMatrixFilter.cpp',
+    'effects/SkCornerPathEffect.cpp',
+    'effects/SkCullPoints.cpp',
+    'effects/SkDashPathEffect.cpp',
+    'effects/SkDiscretePathEffect.cpp',
+    'effects/SkEmbossMask.cpp',
+    'effects/SkEmbossMaskFilter.cpp',
+    'effects/SkGradientShader.cpp',
+    'effects/SkKernel33MaskFilter.cpp',
+    'effects/SkLayerRasterizer.cpp',
+    'effects/SkPaintFlagsDrawFilter.cpp',
+    'effects/SkPixelXorXfermode.cpp',
+    'effects/SkShaderExtras.cpp',
+    'effects/SkTransparentShader.cpp',
+    'effects/SkUnitMappers.cpp',
+    'images/SkImageDecoder.cpp',
+    'images/SkImageRef.cpp',
+    'images/SkStream.cpp',
+    'images/SkStream.cpp',
+    'picture/SkPictureFlat.cpp',
+    'picture/SkPicturePlayback.cpp',
+    'picture/SkPictureRecord.cpp',
+    'ports/SkFontHost_none.cpp',
+    'ports/SkGlobals_global.cpp',
+    'ports/SkImageDecoder_Factory.cpp',
+    'ports/SkOSFile_stdio.cpp',
+    'ports/SkThread_win.cpp',
+    'sgl/SkAlphaRuns.cpp',
+    'sgl/SkBitmap.cpp',
+    'sgl/SkBitmapProcShader.cpp',
+    'sgl/SkBitmapProcState.cpp',
+    'sgl/SkBitmapProcState_matrixProcs.cpp',
+    'sgl/SkBitmapSampler.cpp',
+    'sgl/SkBitmapShader.cpp',
+    'sgl/SkBlitRow_D16.cpp',
+    'sgl/SkBlitRow_D4444.cpp',
+    'sgl/SkBlitter.cpp',
+    'sgl/SkBlitter_4444.cpp',
+    'sgl/SkBlitter_A1.cpp',
+    'sgl/SkBlitter_A8.cpp',
+    'sgl/SkBlitter_ARGB32.cpp',
+    'sgl/SkBlitter_RGB16.cpp',
+    'sgl/SkBlitter_Sprite.cpp',
+    'sgl/SkCanvas.cpp',
+    'sgl/SkColor.cpp',
+    'sgl/SkColorFilter.cpp',
+    'sgl/SkColorTable.cpp',
+    'sgl/SkDeque.cpp',
+    'sgl/SkDevice.cpp',
+    'sgl/SkDither.cpp',
+    'sgl/SkDraw.cpp',
+    'sgl/SkEdge.cpp',
+    'sgl/SkFilterProc.cpp',
+    'sgl/SkFlattenable.cpp',
+    'sgl/SkGeometry.cpp',
+    'sgl/SkGlobals.cpp',
+    'sgl/SkGlyphCache.cpp',
+    'sgl/SkGraphics.cpp',
+    'sgl/SkMask.cpp',
+    'sgl/SkMaskFilter.cpp',
+    'sgl/SkPackBits.cpp',
+    'sgl/SkPaint.cpp',
+    'sgl/SkPath.cpp',
+    'sgl/SkPathEffect.cpp',
+    'sgl/SkPathMeasure.cpp',
+    'sgl/SkPicture.cpp',
+    'sgl/SkPixelRef.cpp',
+    'sgl/SkProcSpriteBlitter.cpp',
+    'sgl/SkPtrRecorder.cpp',
+    'sgl/SkRasterizer.cpp',
+    'sgl/SkRefCnt.cpp',
+    'sgl/SkRegion_path.cpp',
+    'sgl/SkScalerContext.cpp',
+    'sgl/SkScan.cpp',
+    'sgl/SkScan_Antihair.cpp',
+    'sgl/SkScan_AntiPath.cpp',
+    'sgl/SkScan_Hairline.cpp',
+    'sgl/SkScan_Path.cpp',
+    'sgl/SkShader.cpp',
+    'sgl/SkSpriteBlitter_ARGB32.cpp',
+    'sgl/SkSpriteBlitter_RGB16.cpp',
+    'sgl/SkString.cpp',
+    'sgl/SkStroke.cpp',
+    'sgl/SkStrokerPriv.cpp',
+    'sgl/SkTSearch.cpp',
+    'sgl/SkTypeface_fake.cpp',
+    'sgl/SkUtils.cpp',
+    'sgl/SkWriter32.cpp',
+    'sgl/SkXfermode.cpp',
+]
+
+env_p = env.Clone(
+    PCHSTOP = 'SkTypes.h',
+    PDB = 'vc80.pdb',
+)
+
+# TODO(rspangler): This step forces -Zi, but doesn't actually use it.  Need to
+# fix so it doesn't override our -Z7.  -Zi also causes vc80.pdb to be created
+# in the skia directory.
+# TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. 
+# It's a 0-length file so likely harmless.  Is this a side effect of having
+# IncrediBuild installed on the build machine?
+pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')
+env_p['PCH'] = pch
+
+env.ChromeStaticLibrary('skia', input_files + [obj])
diff --git a/third_party/bsdiff/SConscript b/third_party/bsdiff/SConscript
index 964e89a..e1408c8 100644
--- a/third_party/bsdiff/SConscript
+++ b/third_party/bsdiff/SConscript
@@ -1,53 +1,53 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '../bspatch',
-    ]
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-    CCFLAGS = [
-        '/TP',
-        '/wd4800',
-    ],
-  )
-
-input_files = [
-    "mbsdiff.cc",
-]
-
-env.ChromeStaticLibrary('bsdiff', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '../bspatch',
+    ]
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+    CCFLAGS = [
+        '/TP',
+        '/wd4800',
+    ],
+  )
+
+input_files = [
+    "mbsdiff.cc",
+]
+
+env.ChromeStaticLibrary('bsdiff', input_files)
diff --git a/third_party/bspatch/SConscript b/third_party/bspatch/SConscript
index 2858307..7f93b68 100644
--- a/third_party/bspatch/SConscript
+++ b/third_party/bspatch/SConscript
@@ -1,60 +1,60 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone(
-)
-
-env.Prepend(
-    CPPPATH = [
-        '#../third_party/lzma_sdk/',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        '_LZMA_IN_CB',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-    CCFLAGS = [
-        '/TP',
-        '/wd4800',
-    ],
-  )
-
-input_files = [
-    'mbspatch.cc',
-]
-
-env.ChromeStaticLibrary('bspatch', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('env')
+
+env = env.Clone(
+)
+
+env.Prepend(
+    CPPPATH = [
+        '#../third_party/lzma_sdk/',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        '_LZMA_IN_CB',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+    CCFLAGS = [
+        '/TP',
+        '/wd4800',
+    ],
+  )
+
+input_files = [
+    'mbspatch.cc',
+]
+
+env.ChromeStaticLibrary('bspatch', input_files)
diff --git a/third_party/bzip2/SConscript b/third_party/bzip2/SConscript
index dfb351d..6eedeaf 100644
--- a/third_party/bzip2/SConscript
+++ b/third_party/bzip2/SConscript
@@ -1,60 +1,60 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TC',
-          '/wd4996',
-          '/wd4800',
-      ],
-  )
-
-env.Append(
-    CPPDEFINES = [
-        'BZ_NO_STDIO',
-    ],
-)
-
-input_files = [
-    'blocksort.c',
-    'bzlib.c',
-    'compress.c',
-    'crctable.c',
-    'decompress.c',
-    'huffman.c',
-    'randtable.c',
-]
-
-env.ChromeStaticLibrary('bzip2', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('env')
+
+env = env.Clone()
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TC',
+          '/wd4996',
+          '/wd4800',
+      ],
+  )
+
+env.Append(
+    CPPDEFINES = [
+        'BZ_NO_STDIO',
+    ],
+)
+
+input_files = [
+    'blocksort.c',
+    'bzlib.c',
+    'compress.c',
+    'crctable.c',
+    'decompress.c',
+    'huffman.c',
+    'randtable.c',
+]
+
+env.ChromeStaticLibrary('bzip2', input_files)
diff --git a/third_party/libjpeg/SConscript b/third_party/libjpeg/SConscript
index 5b8e723..5c4fce7 100644
--- a/third_party/libjpeg/SConscript
+++ b/third_party/libjpeg/SConscript
@@ -1,95 +1,95 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '#../',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TC',
-          '/wd4800',
-      ],
-  )
-
-input_files = [
-    'jcapimin.c',
-    'jcapistd.c',
-    'jccoefct.c',
-    'jccolor.c',
-    'jcdctmgr.c',
-    'jchuff.c',
-    'jcinit.c',
-    'jcmainct.c',
-    'jcmarker.c',
-    'jcmaster.c',
-    'jcomapi.c',
-    'jcparam.c',
-    'jcphuff.c',
-    'jcprepct.c',
-    'jcsample.c',
-    'jdapimin.c',
-    'jdapistd.c',
-    'jdatadst.c',
-    'jdatasrc.c',
-    'jdcoefct.c',
-    'jdcolor.c',
-    'jddctmgr.c',
-    'jdhuff.c',
-    'jdinput.c',
-    'jdmainct.c',
-    'jdmarker.c',
-    'jdmaster.c',
-    'jdmerge.c',
-    'jdphuff.c',
-    'jdpostct.c',
-    'jdsample.c',
-    'jerror.c',
-    'jfdctflt.c',
-    'jfdctfst.c',
-    'jfdctint.c',
-    'jidctflt.c',
-    'jidctfst.c',
-    'jidctint.c',
-    'jmemmgr.c',
-    'jmemnobs.c',
-    'jquant1.c',
-    'jquant2.c',
-    'jutils.c',
-]
-
-env.ChromeStaticLibrary('libjpeg', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '#../',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TC',
+          '/wd4800',
+      ],
+  )
+
+input_files = [
+    'jcapimin.c',
+    'jcapistd.c',
+    'jccoefct.c',
+    'jccolor.c',
+    'jcdctmgr.c',
+    'jchuff.c',
+    'jcinit.c',
+    'jcmainct.c',
+    'jcmarker.c',
+    'jcmaster.c',
+    'jcomapi.c',
+    'jcparam.c',
+    'jcphuff.c',
+    'jcprepct.c',
+    'jcsample.c',
+    'jdapimin.c',
+    'jdapistd.c',
+    'jdatadst.c',
+    'jdatasrc.c',
+    'jdcoefct.c',
+    'jdcolor.c',
+    'jddctmgr.c',
+    'jdhuff.c',
+    'jdinput.c',
+    'jdmainct.c',
+    'jdmarker.c',
+    'jdmaster.c',
+    'jdmerge.c',
+    'jdphuff.c',
+    'jdpostct.c',
+    'jdsample.c',
+    'jerror.c',
+    'jfdctflt.c',
+    'jfdctfst.c',
+    'jfdctint.c',
+    'jidctflt.c',
+    'jidctfst.c',
+    'jidctint.c',
+    'jmemmgr.c',
+    'jmemnobs.c',
+    'jquant1.c',
+    'jquant2.c',
+    'jutils.c',
+]
+
+env.ChromeStaticLibrary('libjpeg', input_files)
diff --git a/third_party/libpng/SConscript b/third_party/libpng/SConscript
index 5e670dc..5beb689 100644
--- a/third_party/libpng/SConscript
+++ b/third_party/libpng/SConscript
@@ -1,77 +1,77 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '#../third_party/zlib',
-        '#../',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TP',
-          '/wd4800',
-      ],
-  )
-
-env.Append(
-    CPPDEFINES = [
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-    ],
-)
-
-input_files = [
-    'png.c',
-    'pngwutil.c',
-    'pngwtran.c',
-    'pngwrite.c',
-    'pngwio.c',
-    'pngvcrd.c',
-    'pngtrans.c',
-    'pngset.c',
-    'pngrutil.c',
-    'pngrtran.c',
-    'pngrio.c',
-    'pngread.c',
-    'pngpread.c',
-    'pngmem.c',
-    'pngget.c',
-    'pnggccrd.c',
-    'pngerror.c',
-]
-
-env.ChromeStaticLibrary('libpng', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '#../third_party/zlib',
+        '#../',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TP',
+          '/wd4800',
+      ],
+  )
+
+env.Append(
+    CPPDEFINES = [
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+    ],
+)
+
+input_files = [
+    'png.c',
+    'pngwutil.c',
+    'pngwtran.c',
+    'pngwrite.c',
+    'pngwio.c',
+    'pngvcrd.c',
+    'pngtrans.c',
+    'pngset.c',
+    'pngrutil.c',
+    'pngrtran.c',
+    'pngrio.c',
+    'pngread.c',
+    'pngpread.c',
+    'pngmem.c',
+    'pngget.c',
+    'pnggccrd.c',
+    'pngerror.c',
+]
+
+env.ChromeStaticLibrary('libpng', input_files)
diff --git a/third_party/libxml/SConscript b/third_party/libxml/SConscript
index 542c38d..40619e3 100644
--- a/third_party/libxml/SConscript
+++ b/third_party/libxml/SConscript
@@ -1,154 +1,154 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/18n',
-        '$ZLIB_DIR',
-        'scons',
-        'scons/include',
-        'include',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'LIBXML_STATIC',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TC',
-          '/wd4800',
-      ],
-  )
-elif env['PLATFORM'] == 'posix':
-  env.Append(
-      CPPDEFINES = [
-          '_REENTRANT',
-      ],
-  )
-
-
-input_files = [
-    'c14n.c',
-    'catalog.c',
-    'chvalid.c',
-    'debugXML.c',
-    'dict.c',
-    'DOCBparser.c',
-    'encoding.c',
-    'entities.c',
-    'error.c',
-    'globals.c',
-    'hash.c',
-    'HTMLparser.c',
-    'HTMLtree.c',
-    'legacy.c',
-    'list.c',
-    'nanoftp.c',
-    'nanohttp.c',
-    'parser.c',
-    'parserInternals.c',
-    'pattern.c',
-    'relaxng.c',
-    'SAX.c',
-    'SAX2.c',
-    'schematron.c',
-    'threads.c',
-    'tree.c',
-    'uri.c',
-    'valid.c',
-    'xinclude.c',
-    'xlink.c',
-    'xmlIO.c',
-    'xmlmemory.c',
-    'xmlmodule.c',
-    'xmlreader.c',
-    'xmlregexp.c',
-    'xmlsave.c',
-    'xmlschemas.c',
-    'xmlschemastypes.c',
-    'xmlstring.c',
-    'xmlunicode.c',
-    'xmlwriter.c',
-    'xpath.c',
-    'xpointer.c',
-]
-
-env.ChromeStaticLibrary('libxml', input_files)
-
-
-if env['PLATFORM'] == 'win32':
-  config_files = [
-      # The configure.js script must be first in this list; the
-      # env.Command() call below executes the first list element.
-
-      'win32/configure.js',
-      'win32/Makefile.msvc',
-
-      'config.h.in',
-      'configure.in',
-      'libxml-2.0-uninstalled.pc.in',
-      'libxml-2.0.pc.in',
-      'libxml.spec.in',
-      'xml2-config.in',
-      'xml2Conf.sh.in',
-
-      'include/libxml/xmlversion.h.in',
-      'include/win32config.h',
-  ]
-
-  copied_files = []
-  for cf in config_files:
-    result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE'))
-    copied_files.extend(result)
-
-  env.Command(['scons/config.h', 'scons/include/libxml/xmlversion.h'],
-              copied_files,
-              'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
-              CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes')
-elif env['PLATFORM'] == 'posix':
-  config_files = [
-      'config.h',
-      'include/libxml/xmlversion.h',
-      'xml2-config',
-  ]
-  for cf in config_files:
-    result = env.Command('scons/' + cf, 'linux/' + cf,
-                         Copy('$TARGET', '$SOURCE'))
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/18n',
+        '$ZLIB_DIR',
+        'scons',
+        'scons/include',
+        'include',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+        'LIBXML_STATIC',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TC',
+          '/wd4800',
+      ],
+  )
+elif env['PLATFORM'] == 'posix':
+  env.Append(
+      CPPDEFINES = [
+          '_REENTRANT',
+      ],
+  )
+
+
+input_files = [
+    'c14n.c',
+    'catalog.c',
+    'chvalid.c',
+    'debugXML.c',
+    'dict.c',
+    'DOCBparser.c',
+    'encoding.c',
+    'entities.c',
+    'error.c',
+    'globals.c',
+    'hash.c',
+    'HTMLparser.c',
+    'HTMLtree.c',
+    'legacy.c',
+    'list.c',
+    'nanoftp.c',
+    'nanohttp.c',
+    'parser.c',
+    'parserInternals.c',
+    'pattern.c',
+    'relaxng.c',
+    'SAX.c',
+    'SAX2.c',
+    'schematron.c',
+    'threads.c',
+    'tree.c',
+    'uri.c',
+    'valid.c',
+    'xinclude.c',
+    'xlink.c',
+    'xmlIO.c',
+    'xmlmemory.c',
+    'xmlmodule.c',
+    'xmlreader.c',
+    'xmlregexp.c',
+    'xmlsave.c',
+    'xmlschemas.c',
+    'xmlschemastypes.c',
+    'xmlstring.c',
+    'xmlunicode.c',
+    'xmlwriter.c',
+    'xpath.c',
+    'xpointer.c',
+]
+
+env.ChromeStaticLibrary('libxml', input_files)
+
+
+if env['PLATFORM'] == 'win32':
+  config_files = [
+      # The configure.js script must be first in this list; the
+      # env.Command() call below executes the first list element.
+
+      'win32/configure.js',
+      'win32/Makefile.msvc',
+
+      'config.h.in',
+      'configure.in',
+      'libxml-2.0-uninstalled.pc.in',
+      'libxml-2.0.pc.in',
+      'libxml.spec.in',
+      'xml2-config.in',
+      'xml2Conf.sh.in',
+
+      'include/libxml/xmlversion.h.in',
+      'include/win32config.h',
+  ]
+
+  copied_files = []
+  for cf in config_files:
+    result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE'))
+    copied_files.extend(result)
+
+  env.Command(['scons/config.h', 'scons/include/libxml/xmlversion.h'],
+              copied_files,
+              'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
+              CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes')
+elif env['PLATFORM'] == 'posix':
+  config_files = [
+      'config.h',
+      'include/libxml/xmlversion.h',
+      'xml2-config',
+  ]
+  for cf in config_files:
+    result = env.Command('scons/' + cf, 'linux/' + cf,
+                         Copy('$TARGET', '$SOURCE'))
+
diff --git a/third_party/libxslt/SConscript b/third_party/libxslt/SConscript
index dc44477..dbf2c91 100644
--- a/third_party/libxslt/SConscript
+++ b/third_party/libxslt/SConscript
@@ -1,131 +1,131 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$LIBXML_DIR/scons/include',
-        '$LIBXML_DIR/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/18n',
-        '$ZLIB_DIR',
-        'scons',
-        '.',
-        '../',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'LIBXML_STATIC',
-        'LIBXSLT_STATIC',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TC',
-          '/wd4800',
-      ],
-  )
-
-
-input_files = [
-    'libxslt/attributes.c',
-    'libxslt/attrvt.c',
-    'libxslt/documents.c',
-    'libxslt/extensions.c',
-    'libxslt/extra.c',
-    'libxslt/functions.c',
-    'libxslt/imports.c',
-    'libxslt/keys.c',
-    'libxslt/namespaces.c',
-    'libxslt/numbers.c',
-    'libxslt/pattern.c',
-    'libxslt/preproc.c',
-    'libxslt/security.c',
-    'libxslt/templates.c',
-    'libxslt/transform.c',
-    'libxslt/variables.c',
-    'libxslt/xslt.c',
-    'libxslt/xsltutils.c',
-]
-
-env.ChromeStaticLibrary('libxslt', input_files)
-
-
-if env['PLATFORM'] == 'win32':
-  config_files = [
-      # The configure.js script must be first in this list; the
-      # env.Command() call below executes the first list element.
-
-      'win32/configure.js',
-      'win32/Makefile.msvc',
-
-      'config.h.in',
-      'configure.in',
-      'libexslt.pc.in',
-      'libxslt.pc.in',
-      'libxslt.spec.in',
-      'xslt-config.in',
-      'xsltConf.sh.in',
-
-      'libexslt/exsltconfig.h.in',
-
-      'libxslt/xsltconfig.h.in',
-      'libxslt/xsltwin32config.h.in',
-      'libxslt/win32config.h',
-  ]
-
-  copied_sources = []
-  for cf in config_files:
-    result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE'))
-    copied_sources.extend(result)
-
-  env.Command(['scons/config.h'],
-              copied_sources,
-              'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
-              CONFIG_OPTIONS='compiler=msvc')
-elif env['PLATFORM'] == 'posix':
-  config_files = [
-      'config.h',
-      'xslt-config',
-      'libexslt/exsltconfig.h',
-      'libxslt/xsltconfig.h',
-      'libxslt/xsltwin32config.h',
-  ]
-  for cf in config_files:
-    result = env.Command('scons/' + cf, 'linux/' + cf,
-                         Copy('$TARGET', '$SOURCE'))
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$LIBXML_DIR/scons/include',
+        '$LIBXML_DIR/include',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/18n',
+        '$ZLIB_DIR',
+        'scons',
+        '.',
+        '../',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+        'LIBXML_STATIC',
+        'LIBXSLT_STATIC',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TC',
+          '/wd4800',
+      ],
+  )
+
+
+input_files = [
+    'libxslt/attributes.c',
+    'libxslt/attrvt.c',
+    'libxslt/documents.c',
+    'libxslt/extensions.c',
+    'libxslt/extra.c',
+    'libxslt/functions.c',
+    'libxslt/imports.c',
+    'libxslt/keys.c',
+    'libxslt/namespaces.c',
+    'libxslt/numbers.c',
+    'libxslt/pattern.c',
+    'libxslt/preproc.c',
+    'libxslt/security.c',
+    'libxslt/templates.c',
+    'libxslt/transform.c',
+    'libxslt/variables.c',
+    'libxslt/xslt.c',
+    'libxslt/xsltutils.c',
+]
+
+env.ChromeStaticLibrary('libxslt', input_files)
+
+
+if env['PLATFORM'] == 'win32':
+  config_files = [
+      # The configure.js script must be first in this list; the
+      # env.Command() call below executes the first list element.
+
+      'win32/configure.js',
+      'win32/Makefile.msvc',
+
+      'config.h.in',
+      'configure.in',
+      'libexslt.pc.in',
+      'libxslt.pc.in',
+      'libxslt.spec.in',
+      'xslt-config.in',
+      'xsltConf.sh.in',
+
+      'libexslt/exsltconfig.h.in',
+
+      'libxslt/xsltconfig.h.in',
+      'libxslt/xsltwin32config.h.in',
+      'libxslt/win32config.h',
+  ]
+
+  copied_sources = []
+  for cf in config_files:
+    result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE'))
+    copied_sources.extend(result)
+
+  env.Command(['scons/config.h'],
+              copied_sources,
+              'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
+              CONFIG_OPTIONS='compiler=msvc')
+elif env['PLATFORM'] == 'posix':
+  config_files = [
+      'config.h',
+      'xslt-config',
+      'libexslt/exsltconfig.h',
+      'libxslt/xsltconfig.h',
+      'libxslt/xsltwin32config.h',
+  ]
+  for cf in config_files:
+    result = env.Command('scons/' + cf, 'linux/' + cf,
+                         Copy('$TARGET', '$SOURCE'))
+
diff --git a/third_party/lzma_sdk/SConscript b/third_party/lzma_sdk/SConscript
index 3f902d0..679d362 100644
--- a/third_party/lzma_sdk/SConscript
+++ b/third_party/lzma_sdk/SConscript
@@ -1,72 +1,72 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone(
-)
-
-env.Prepend(
-    CPPPATH = [
-        '.',
-        '../../',
-    ]
-)
-
-env.Append(
-    CPPDEFINES = [
-        '_LZMA_PROB32',
-        '_LZMA_IN_CB',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-    CCFLAGS = [
-        '/TC',
-        '/wd4800',
-    ],
-  )
-
-input_files = [
-    '7zCrc.c',
-    'Archive/7z/7zAlloc.c',
-    'Archive/7z/7zBuffer.c',
-    'Archive/7z/7zDecode.c',
-    'Archive/7z/7zExtract.c',
-    'Archive/7z/7zHeader.c',
-    'Archive/7z/7zIn.c',
-    'Archive/7z/7zItem.c',
-    'Archive/7z/7zMethodID.c',
-    'Compress/Branch/BranchX86.c',
-    'Compress/Branch/BranchX86_2.c',
-    'Compress/Lzma/LzmaDecode.c',
-]
-
-env.ChromeStaticLibrary('lzma_sdk', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone(
+)
+
+env.Prepend(
+    CPPPATH = [
+        '.',
+        '../../',
+    ]
+)
+
+env.Append(
+    CPPDEFINES = [
+        '_LZMA_PROB32',
+        '_LZMA_IN_CB',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+    CCFLAGS = [
+        '/TC',
+        '/wd4800',
+    ],
+  )
+
+input_files = [
+    '7zCrc.c',
+    'Archive/7z/7zAlloc.c',
+    'Archive/7z/7zBuffer.c',
+    'Archive/7z/7zDecode.c',
+    'Archive/7z/7zExtract.c',
+    'Archive/7z/7zHeader.c',
+    'Archive/7z/7zIn.c',
+    'Archive/7z/7zItem.c',
+    'Archive/7z/7zMethodID.c',
+    'Compress/Branch/BranchX86.c',
+    'Compress/Branch/BranchX86_2.c',
+    'Compress/Lzma/LzmaDecode.c',
+]
+
+env.ChromeStaticLibrary('lzma_sdk', input_files)
diff --git a/third_party/modp_b64/SConscript b/third_party/modp_b64/SConscript
index 8fe815c..37f9ca5 100644
--- a/third_party/modp_b64/SConscript
+++ b/third_party/modp_b64/SConscript
@@ -1,46 +1,46 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone(
-    PDB = 'vc80.pdb',
-)
-
-env.Prepend(
-    CPPPATH = [
-        '#/..',
-    ],
-)
-
-input_files = [
-    'modp_b64.cc',
-]
-
-env.ChromeStaticLibrary('modp_b64', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone(
+    PDB = 'vc80.pdb',
+)
+
+env.Prepend(
+    CPPPATH = [
+        '#/..',
+    ],
+)
+
+input_files = [
+    'modp_b64.cc',
+]
+
+env.ChromeStaticLibrary('modp_b64', input_files)
diff --git a/third_party/zlib/SConscript b/third_party/zlib/SConscript
index c17f4bb..490ce01 100644
--- a/third_party/zlib/SConscript
+++ b/third_party/zlib/SConscript
@@ -1,58 +1,58 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TC',
-          '/wd4800',
-      ],
-  )
-
-input_files = [
-    'adler32.c',
-    'compress.c',
-    'crc32.c',
-    'deflate.c',
-    'gzio.c',
-    'infback.c',
-    'inffast.c',
-    'inflate.c',
-    'inftrees.c',
-    'trees.c',
-    'uncompr.c',
-    'zutil.c',
-]
-
-env.ChromeStaticLibrary('zlib', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('env')
+
+env = env.Clone()
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TC',
+          '/wd4800',
+      ],
+  )
+
+input_files = [
+    'adler32.c',
+    'compress.c',
+    'crc32.c',
+    'deflate.c',
+    'gzio.c',
+    'infback.c',
+    'inffast.c',
+    'inflate.c',
+    'inftrees.c',
+    'trees.c',
+    'uncompr.c',
+    'zutil.c',
+]
+
+env.ChromeStaticLibrary('zlib', input_files)
diff --git a/webkit/SConscript b/webkit/SConscript
index 27b2a4b..55ceb83 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -1,207 +1,207 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import os
-
-Import(['env'])
-
-env = env.Clone()
-env_res = env.Clone()
-
-
-port_dir = env.Dir('#/$BUILD_TYPE/webkit/port')
-
-port_dir.addRepository(env.Dir('#/../webkit/port'))
-port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore'))
-
-
-env.Prepend(
-    CPPPATH = [
-        '$WEBKIT_DIR/build/localized_strings',
-        '$WEBKIT_DIR/build/JSConfig/obj/WebCore',
-        '$WEBKIT_DIR/build/WebCore',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$NPAPI_DIR',
-        '$V8_DIR/src/api',
-        '$V8_DIR/public',
-        '$WEBKIT_DIR/V8Bindings/DerivedSources',
-        '$WEBKIT_DIR/V8Bindings/SharedSources',
-        '$WEBKIT_DIR/port/bindings/v8',
-        '$WEBKIT_DIR/WebCore',
-        '$WEBKIT_DIR/WebCore/JavaScriptHeaders',
-        '$WEBKIT_DIR/WebCore/JavaScriptHeaders/JavaScriptCore',
-        '$WEBKIT_DIR/pending',
-        '$WEBKIT_DIR/pending/kjs',
-        '$WEBKIT_DIR/pending/wtf',
-        '$WEBKIT_DIR/port/bridge',
-        '$WEBKIT_DIR/port/css',
-        '$WEBKIT_DIR/port/dom',
-        '$WEBKIT_DIR/port/editing',
-        '$WEBKIT_DIR/port/history',
-        '$WEBKIT_DIR/port/html',
-        '$WEBKIT_DIR/port/loader',
-        '$WEBKIT_DIR/port/loader/icon',
-        '$WEBKIT_DIR/port/page',
-        '$WEBKIT_DIR/port/platform',
-        '$WEBKIT_DIR/port/platform/network',
-        '$WEBKIT_DIR/port/platform/text',
-        '$WEBKIT_DIR/port/plugins',
-        '$WEBKIT_DIR/port/rendering',
-        '#/',
-        '.',
-
-        '$WEBKIT_DIR/port/platform/image-decoders',
-        '$WEBKIT_DIR/port/platform/image-decoders/bmp',
-        '$WEBKIT_DIR/port/platform/image-decoders/gif',
-        '$WEBKIT_DIR/port/platform/image-decoders/ico',
-        '$WEBKIT_DIR/port/platform/image-decoders/jpeg',
-        '$WEBKIT_DIR/port/platform/image-decoders/png',
-        '$WEBKIT_DIR/port/platform/image-decoders/xbm',
-        '$WEBKIT_DIR/port/platform/image-decoders/zlib',
-
-        '$WEBKIT_DIR/port/platform/graphics',
-
-        '$WEBKIT_DIR/port/svg/graphics',
-        '$WEBKIT_DIR/port/platform/network',
-        '$WEBKIT_DIR/port/platform/sql',
-        '$WEBKIT_DIR/port/platform/network/win',
-        '$WEBKIT_DIR/port/rendering',
-        '$WEBKIT_DIR/port/storage',
-        '$WEBKIT_DIR/port/xml',
-        '$WEBKIT_DIR/port',
-        '$WEBKIT_DIR/port/os-win32',
-        '$WEBKIT_DIR/port/wtf',
-        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore',
-        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/wtf',
-        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32',
-        '$WEBKIT_DIR/port/svg',
-        '$WEBKIT_DIR/port/svg/graphics/filters',
-        '$WEBKIT_DIR/port/plugins',
-        '$LIBXSLT_DIR/scons',
-        '$LIBXSLT_DIR',
-        '$LIBXML_DIR/scons/include',
-        '$LIBXML_DIR/include',
-        '$LIBPNG_DIR',
-        '$ZLIB_DIR',
-        '$LIBJPEG_DIR',
-        '$WEBKIT_DIR/DerivedSources',
-        '#/..',
-    ],
-)
-
-env.Append(
-    WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore",
-    PENDING_DIR = "$WEBKIT_DIR/pending",
-    PORT_DIR = "$WEBKIT_DIR/port",
-
-    JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore",
-    WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf",
-    KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs",
-    PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre",
-
-    V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings",
-    DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"),
-    SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"),
-
-    CPPDEFINES = [
-      'U_STATIC_IMPLEMENTATION'
-      '_CRT_SECURE_NO_DEPRECATE',
-      '_CRT_NONSTDC_NO_WARNINGS',
-      '_CRT_NONSTDC_NO_DEPRECATE',
-      '_SCL_SECURE_NO_DEPRECATE',
-      '_SCL_SECURE_NO_WARNINGS',
-      ['CRASH', '__debugbreak'],
-      ['ENABLE_CROSS_DOCUMENT_MESSAGING', '1'],
-      ['ENABLE_XSLT', '1'],
-      ['ENABLE_XPATH', '1'],
-      ['ENABLE_SVG', '1'],
-      ['ENABLE_SVG_AS_IMAGE', '1'],
-      ['ENABLE_SVG_USE', '1'],
-      ['ENABLE_SVG_FOREIGN_OBJECT', '1'],
-      ['ENABLE_SVG_FONTS', '1'],
-      ['ANDROID_CANVAS_IMPL', '1'],
-      ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'],
-      'USE_GOOGLE_URL_LIBRARY',
-
-      '_WIN32_WINNT=0x0600',
-      'WINVER=0x0600',
-
-      'LIBXSLT_STATIC',
-      'LIBXML_STATIC',
-      'PNG_USER_CONFIG',
-      'CHROME_PNG_WRITE_SUPPORT',
-      ['__PRETTY_FUNCTION__', '__FUNCTION__'],
-      'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2',
-
-      'HAVE_CONFIG_H',
-      '__STD_C',
-    ],
-)
-
-
-sconscript_dirs = [
-    'SConscript.port',
-    'SConscript.javascriptcore_pcre',
-    'activex_shim/SConscript',
-    'activex_shim_dll/SConscript',
-    'build/JSConfig/SConscript',
-    'build/JavaScriptCore/SConscript',
-    'build/localized_strings/SConscript',
-    'build/port/SConscript',
-    'build/V8Bindings/SConscript',
-    'build/WebCore/SConscript',
-    'default_plugin/SConscript',
-    'glue/SConscript',
-    'glue/plugins/test/SConscript',
-    'tools/npapi_layout_test_plugin/SConscript',
-    'tools/test_shell/SConscript',
-    'tools/test_shell/resources/fonts/SConscript',
-]
-
-env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
-
-# Setup alias for all webkit related targets.
-# We'd like to do this as follows, but it leads to out-of-memory
-# errors when SCons tries to use the entire contents of the
-# directory tree as a huge content-signature string.
-# Instead we're going to let all the subsidiary SConscript files
-# add their own individual targets to the 'webkit' Alias.
-#env.Alias('webkit', ['.', '../icudt38.dll'])
-env.Alias('webkit', ['../icudt38.dll'])
-
-
-version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
-                      ['$WEBCORE_DIR/Configurations/Version.xcconfig',
-                       '#/../webkit/build/webkit_version.py'],
-                      "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
-env.AlwaysBuild(version)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os
+
+Import(['env'])
+
+env = env.Clone()
+env_res = env.Clone()
+
+
+port_dir = env.Dir('#/$BUILD_TYPE/webkit/port')
+
+port_dir.addRepository(env.Dir('#/../webkit/port'))
+port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore'))
+
+
+env.Prepend(
+    CPPPATH = [
+        '$WEBKIT_DIR/build/localized_strings',
+        '$WEBKIT_DIR/build/JSConfig/obj/WebCore',
+        '$WEBKIT_DIR/build/WebCore',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '$SKIA_DIR/include',
+        '$SKIA_DIR/include/corecg',
+        '$SKIA_DIR/platform',
+        '$NPAPI_DIR',
+        '$V8_DIR/src/api',
+        '$V8_DIR/public',
+        '$WEBKIT_DIR/V8Bindings/DerivedSources',
+        '$WEBKIT_DIR/V8Bindings/SharedSources',
+        '$WEBKIT_DIR/port/bindings/v8',
+        '$WEBKIT_DIR/WebCore',
+        '$WEBKIT_DIR/WebCore/JavaScriptHeaders',
+        '$WEBKIT_DIR/WebCore/JavaScriptHeaders/JavaScriptCore',
+        '$WEBKIT_DIR/pending',
+        '$WEBKIT_DIR/pending/kjs',
+        '$WEBKIT_DIR/pending/wtf',
+        '$WEBKIT_DIR/port/bridge',
+        '$WEBKIT_DIR/port/css',
+        '$WEBKIT_DIR/port/dom',
+        '$WEBKIT_DIR/port/editing',
+        '$WEBKIT_DIR/port/history',
+        '$WEBKIT_DIR/port/html',
+        '$WEBKIT_DIR/port/loader',
+        '$WEBKIT_DIR/port/loader/icon',
+        '$WEBKIT_DIR/port/page',
+        '$WEBKIT_DIR/port/platform',
+        '$WEBKIT_DIR/port/platform/network',
+        '$WEBKIT_DIR/port/platform/text',
+        '$WEBKIT_DIR/port/plugins',
+        '$WEBKIT_DIR/port/rendering',
+        '#/',
+        '.',
+
+        '$WEBKIT_DIR/port/platform/image-decoders',
+        '$WEBKIT_DIR/port/platform/image-decoders/bmp',
+        '$WEBKIT_DIR/port/platform/image-decoders/gif',
+        '$WEBKIT_DIR/port/platform/image-decoders/ico',
+        '$WEBKIT_DIR/port/platform/image-decoders/jpeg',
+        '$WEBKIT_DIR/port/platform/image-decoders/png',
+        '$WEBKIT_DIR/port/platform/image-decoders/xbm',
+        '$WEBKIT_DIR/port/platform/image-decoders/zlib',
+
+        '$WEBKIT_DIR/port/platform/graphics',
+
+        '$WEBKIT_DIR/port/svg/graphics',
+        '$WEBKIT_DIR/port/platform/network',
+        '$WEBKIT_DIR/port/platform/sql',
+        '$WEBKIT_DIR/port/platform/network/win',
+        '$WEBKIT_DIR/port/rendering',
+        '$WEBKIT_DIR/port/storage',
+        '$WEBKIT_DIR/port/xml',
+        '$WEBKIT_DIR/port',
+        '$WEBKIT_DIR/port/os-win32',
+        '$WEBKIT_DIR/port/wtf',
+        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore',
+        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/wtf',
+        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32',
+        '$WEBKIT_DIR/port/svg',
+        '$WEBKIT_DIR/port/svg/graphics/filters',
+        '$WEBKIT_DIR/port/plugins',
+        '$LIBXSLT_DIR/scons',
+        '$LIBXSLT_DIR',
+        '$LIBXML_DIR/scons/include',
+        '$LIBXML_DIR/include',
+        '$LIBPNG_DIR',
+        '$ZLIB_DIR',
+        '$LIBJPEG_DIR',
+        '$WEBKIT_DIR/DerivedSources',
+        '#/..',
+    ],
+)
+
+env.Append(
+    WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore",
+    PENDING_DIR = "$WEBKIT_DIR/pending",
+    PORT_DIR = "$WEBKIT_DIR/port",
+
+    JAVASCRIPTCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore",
+    WTF_DIR = "$JAVASCRIPTCORE_DIR/wtf",
+    KJS_DIR = "$JAVASCRIPTCORE_DIR/kjs",
+    PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre",
+
+    V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings",
+    DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"),
+    SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"),
+
+    CPPDEFINES = [
+      'U_STATIC_IMPLEMENTATION'
+      '_CRT_SECURE_NO_DEPRECATE',
+      '_CRT_NONSTDC_NO_WARNINGS',
+      '_CRT_NONSTDC_NO_DEPRECATE',
+      '_SCL_SECURE_NO_DEPRECATE',
+      '_SCL_SECURE_NO_WARNINGS',
+      ['CRASH', '__debugbreak'],
+      ['ENABLE_CROSS_DOCUMENT_MESSAGING', '1'],
+      ['ENABLE_XSLT', '1'],
+      ['ENABLE_XPATH', '1'],
+      ['ENABLE_SVG', '1'],
+      ['ENABLE_SVG_AS_IMAGE', '1'],
+      ['ENABLE_SVG_USE', '1'],
+      ['ENABLE_SVG_FOREIGN_OBJECT', '1'],
+      ['ENABLE_SVG_FONTS', '1'],
+      ['ANDROID_CANVAS_IMPL', '1'],
+      ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'],
+      'USE_GOOGLE_URL_LIBRARY',
+
+      '_WIN32_WINNT=0x0600',
+      'WINVER=0x0600',
+
+      'LIBXSLT_STATIC',
+      'LIBXML_STATIC',
+      'PNG_USER_CONFIG',
+      'CHROME_PNG_WRITE_SUPPORT',
+      ['__PRETTY_FUNCTION__', '__FUNCTION__'],
+      'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2',
+
+      'HAVE_CONFIG_H',
+      '__STD_C',
+    ],
+)
+
+
+sconscript_dirs = [
+    'SConscript.port',
+    'SConscript.javascriptcore_pcre',
+    'activex_shim/SConscript',
+    'activex_shim_dll/SConscript',
+    'build/JSConfig/SConscript',
+    'build/JavaScriptCore/SConscript',
+    'build/localized_strings/SConscript',
+    'build/port/SConscript',
+    'build/V8Bindings/SConscript',
+    'build/WebCore/SConscript',
+    'default_plugin/SConscript',
+    'glue/SConscript',
+    'glue/plugins/test/SConscript',
+    'tools/npapi_layout_test_plugin/SConscript',
+    'tools/test_shell/SConscript',
+    'tools/test_shell/resources/fonts/SConscript',
+]
+
+env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
+
+# Setup alias for all webkit related targets.
+# We'd like to do this as follows, but it leads to out-of-memory
+# errors when SCons tries to use the entire contents of the
+# directory tree as a huge content-signature string.
+# Instead we're going to let all the subsidiary SConscript files
+# add their own individual targets to the 'webkit' Alias.
+#env.Alias('webkit', ['.', '../icudt38.dll'])
+env.Alias('webkit', ['../icudt38.dll'])
+
+
+version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
+                      ['$WEBCORE_DIR/Configurations/Version.xcconfig',
+                       '#/../webkit/build/webkit_version.py'],
+                      "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
+env.AlwaysBuild(version)
diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript
index 8855e64..f353f6de 100644
--- a/webkit/activex_shim/SConscript
+++ b/webkit/activex_shim/SConscript
@@ -1,68 +1,68 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$NPAPI_DIR',
-        '#/..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'TRACK_INTERFACE',
-    ],
-    CCFLAGS = [
-        '/TP',
-
-        '/WX',
-        '/Wp64',
-    ],
-# TODO(bradnelson): Scons should really have a way to handle this.
-    ARFLAGS = [
-        '/LIBPATH:$PLATFORMSDK_VISTA_REL', 'Urlmon.Lib',
-    ],
-)
-
-input_files = [
-    'activex_plugin.cc',
-    'activex_shared.cc',
-    'activex_util.cc',
-    'dispatch_object.cc',
-    'npn_scripting.cc',
-    'npp_impl.cc',
-    'web_activex_container.cc',
-    'web_activex_site.cc',
-]
-
-env.ChromeStaticLibrary('activex_shim', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$NPAPI_DIR',
+        '#/..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'TRACK_INTERFACE',
+    ],
+    CCFLAGS = [
+        '/TP',
+
+        '/WX',
+        '/Wp64',
+    ],
+# TODO(bradnelson): Scons should really have a way to handle this.
+    ARFLAGS = [
+        '/LIBPATH:$PLATFORMSDK_VISTA_REL', 'Urlmon.Lib',
+    ],
+)
+
+input_files = [
+    'activex_plugin.cc',
+    'activex_shared.cc',
+    'activex_util.cc',
+    'dispatch_object.cc',
+    'npn_scripting.cc',
+    'npp_impl.cc',
+    'web_activex_container.cc',
+    'web_activex_site.cc',
+]
+
+env.ChromeStaticLibrary('activex_shim', input_files)
diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript
index 5a3a5e2..baa794f 100644
--- a/webkit/activex_shim_dll/SConscript
+++ b/webkit/activex_shim_dll/SConscript
@@ -1,73 +1,73 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$NPAPI_DIR',
-        '#/..',
-    ],
-    LIBS = [
-        'activex_shim',
-        'googleurl',
-        'icuuc',
-        'base',
-    ],
-)
-
-env.Append(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/MANIFEST',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/DEBUG',
-    ],
-)
-
-input_files = [
-    'activex_shim_dll.cc',
-    'activex_shim_dll.def',
-]
-
-dll = env.ChromeSharedLibrary('npaxshim', input_files)
-i = env.Install('$TARGET_ROOT', dll)
-env.Alias('webkit', i)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '$NPAPI_DIR',
+        '#/..',
+    ],
+    LIBS = [
+        'activex_shim',
+        'googleurl',
+        'icuuc',
+        'base',
+    ],
+)
+
+env.Append(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+
+        '/MANIFEST',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/MACHINE:X86',
+        '/FIXED:No',
+
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+
+        '/DEBUG',
+    ],
+)
+
+input_files = [
+    'activex_shim_dll.cc',
+    'activex_shim_dll.def',
+]
+
+dll = env.ChromeSharedLibrary('npaxshim', input_files)
+i = env.Install('$TARGET_ROOT', dll)
+env.Alias('webkit', i)
diff --git a/webkit/build/JSConfig/SConscript b/webkit/build/JSConfig/SConscript
index 003a76b..e3a15cf 100644
--- a/webkit/build/JSConfig/SConscript
+++ b/webkit/build/JSConfig/SConscript
@@ -1,39 +1,39 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-# TODO(bradnelson): very bad, calls batch, calls sh, deps all wrong
-env.Append(ENV = {"OS" : "Windows_NT"})
-env.Command("obj/WebCore/config.h",
-            ["prebuild.bat", "../../config.h.in"],
-            "cd ${SOURCE.dir} && ${SOURCE.file} ${JSCONFIG_DIR.abspath} v8",
-            JSCONFIG_DIR = env.Dir('$WEBKIT_DIR/build/JSConfig'))
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+# TODO(bradnelson): very bad, calls batch, calls sh, deps all wrong
+env.Append(ENV = {"OS" : "Windows_NT"})
+env.Command("obj/WebCore/config.h",
+            ["prebuild.bat", "../../config.h.in"],
+            "cd ${SOURCE.dir} && ${SOURCE.file} ${JSCONFIG_DIR.abspath} v8",
+            JSCONFIG_DIR = env.Dir('$WEBKIT_DIR/build/JSConfig'))
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 32feacd..c00c092 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -1,170 +1,170 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-cygwin = Dir('#../third_party/cygwin/bin')
-cygwin_posix = cygwin.abspath.replace('\\', '/')
-env.PrependENVPath('PATH', '../third_party/cygwin/bin')
-
-
-hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $TARGET'
-
-env.Replace(
-    CREATE_HASH_TABLE_COM       = hash_table_cmd,
-    CREATE_HASH_TABLE           = env.File('#/../third_party/WebKit/JavascriptCore/kjs/create_hash_table'),
-    CREATE_HASH_TABLE_FLAGS     = '-i',
-)
-
-env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM',
-                                            suffix = '.lut.h',
-                                            src_suffix = '.cpp')
-
-
-inputs = [
-    'array_object',
-    'date_object',
-    'math_object',
-    'number_object',
-    'regexp_object',
-    'string_object',
-]
-
-for i in inputs:
-    env.Lookup_Table_h(i, '$KJS_DIR/%s.cpp' % i)
-
-env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table',
-                   CREATE_HASH_TABLE_FLAGS='')
-
-# TODO(bradnelson): sucks, needs relative path
-env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c',
-            '$PCRE_DIR/dftables',
-            '$PERL ../third_party/WebKit/JavaScriptCore/pcre/dftables ' + \
-            '${TARGET.posix}')
-
-# We'd like to do this as follows:
-#env.CXXFile('grammar.cpp', '$KJS_DIR/grammar.y')
-# but SCons has a HARD-WIRED notion that the source must be a .yy file.
-# TODO(bradnelson): not sure why YACCCOM is needed, but fails without
-cpp = env.Command(['grammar.cpp', 'grammar.h'],
-                  '$KJS_DIR/grammar.y',
-                  '$YACCCOM',
-                  YACCCOM = '$YACC $YACCFLAGS -o $TARGET $SOURCES',
-                  YACCFLAGS = '-d -p kjsyy')
-env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/grammar.hpp'))
-
-copies = [
-    'API/APICast.h',
-    'API/JSBase.h',
-    'API/JSValueRef.h',
-    'API/JSObjectRef.h',
-    'API/JSRetainPtr.h',
-    'API/JSContextRef.h',
-    'API/JSStringRef.h',
-    'API/JSStringRefCF.h',
-    'API/JSStringRefBSTR.h',
-    'API/JavaScriptCore.h',
-    'bindings/npruntime.h',
-    'bindings/runtime.h',
-    'bindings/np_jsobject.h',
-    'bindings/npruntime_internal.h',
-    'bindings/npruntime_impl.h',
-    'bindings/runtime_object.h',
-    'bindings/runtime_root.h',
-    'kjs/JSLock.h',
-    'kjs/interpreter.h',
-    'wtf/HashCountedSet.h',
-]
-
-JSCORE_OUT = '$WEBKIT_DIR/scons/WebCore/JavaScriptCore'
-
-for c in copies:
-  i = env.Install(JSCORE_OUT, '$JAVASCRIPTCORE_DIR/' + c)
-  env.Alias('webkit', i)
-
-i = env.Install(JSCORE_OUT, '../../pending/kjs/collector.h')
-env.Alias('webkit', i)
-
-
-# Stuff for WTF
-env = env.Clone(
-    CPPPATH = [
-        '$WEBKIT_DIR/build/JavaScriptCore',
-        '$JAVASCRIPTCORE_DIR',
-        '$JAVASCRIPTCORE_DIR/os-win32',
-        '$JAVASCRIPTCORE_DIR/kjs',
-        '$WTF_DIR',
-        '$JAVASCRIPTCORE_DIR/API',
-        '$JAVASCRIPTCORE_DIR/bindings',
-        '$JAVASCRIPTCORE_DIR/bindings/c',
-        '$JAVASCRIPTCORE_DIR/bindings/jni',
-        '$WEBKIT_DIR/pending',
-        '$WEBKIT_DIR/pending/wtf',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$WEBKIT_DIR',
-        '#/..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'HAVE_CONFIG_H',
-        '__STD_C',
-        'CRASH=__debugbreak',
-        'U_STATIC_IMPLEMENTATION',
-        '_WIN32_WINNT=0x0600',
-        'WINVER=0x0600',
-    ],
-    CCFLAGS = [
-        '/TP',
-
-        '/WX',
-        '/Wp64',
-
-        '/wd4127',
-        '/wd4355',
-        '/wd4510',
-        '/wd4512',
-        '/wd4610',
-        '/wd4706',
-    ],
-)
-
-wtf_inputs = [
-    '$WTF_DIR/Assertions.cpp',
-    '$WTF_DIR/unicode/UTF8.cpp',
-    '$WTF_DIR/TCSystemAlloc.cpp',
-    '$WTF_DIR/HashTable.cpp',
-]
-
-env.ChromeStaticLibrary('WTF', wtf_inputs)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+cygwin = Dir('#../third_party/cygwin/bin')
+cygwin_posix = cygwin.abspath.replace('\\', '/')
+env.PrependENVPath('PATH', '../third_party/cygwin/bin')
+
+
+hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $TARGET'
+
+env.Replace(
+    CREATE_HASH_TABLE_COM       = hash_table_cmd,
+    CREATE_HASH_TABLE           = env.File('#/../third_party/WebKit/JavascriptCore/kjs/create_hash_table'),
+    CREATE_HASH_TABLE_FLAGS     = '-i',
+)
+
+env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM',
+                                            suffix = '.lut.h',
+                                            src_suffix = '.cpp')
+
+
+inputs = [
+    'array_object',
+    'date_object',
+    'math_object',
+    'number_object',
+    'regexp_object',
+    'string_object',
+]
+
+for i in inputs:
+    env.Lookup_Table_h(i, '$KJS_DIR/%s.cpp' % i)
+
+env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table',
+                   CREATE_HASH_TABLE_FLAGS='')
+
+# TODO(bradnelson): sucks, needs relative path
+env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c',
+            '$PCRE_DIR/dftables',
+            '$PERL ../third_party/WebKit/JavaScriptCore/pcre/dftables ' + \
+            '${TARGET.posix}')
+
+# We'd like to do this as follows:
+#env.CXXFile('grammar.cpp', '$KJS_DIR/grammar.y')
+# but SCons has a HARD-WIRED notion that the source must be a .yy file.
+# TODO(bradnelson): not sure why YACCCOM is needed, but fails without
+cpp = env.Command(['grammar.cpp', 'grammar.h'],
+                  '$KJS_DIR/grammar.y',
+                  '$YACCCOM',
+                  YACCCOM = '$YACC $YACCFLAGS -o $TARGET $SOURCES',
+                  YACCFLAGS = '-d -p kjsyy')
+env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/grammar.hpp'))
+
+copies = [
+    'API/APICast.h',
+    'API/JSBase.h',
+    'API/JSValueRef.h',
+    'API/JSObjectRef.h',
+    'API/JSRetainPtr.h',
+    'API/JSContextRef.h',
+    'API/JSStringRef.h',
+    'API/JSStringRefCF.h',
+    'API/JSStringRefBSTR.h',
+    'API/JavaScriptCore.h',
+    'bindings/npruntime.h',
+    'bindings/runtime.h',
+    'bindings/np_jsobject.h',
+    'bindings/npruntime_internal.h',
+    'bindings/npruntime_impl.h',
+    'bindings/runtime_object.h',
+    'bindings/runtime_root.h',
+    'kjs/JSLock.h',
+    'kjs/interpreter.h',
+    'wtf/HashCountedSet.h',
+]
+
+JSCORE_OUT = '$WEBKIT_DIR/scons/WebCore/JavaScriptCore'
+
+for c in copies:
+  i = env.Install(JSCORE_OUT, '$JAVASCRIPTCORE_DIR/' + c)
+  env.Alias('webkit', i)
+
+i = env.Install(JSCORE_OUT, '../../pending/kjs/collector.h')
+env.Alias('webkit', i)
+
+
+# Stuff for WTF
+env = env.Clone(
+    CPPPATH = [
+        '$WEBKIT_DIR/build/JavaScriptCore',
+        '$JAVASCRIPTCORE_DIR',
+        '$JAVASCRIPTCORE_DIR/os-win32',
+        '$JAVASCRIPTCORE_DIR/kjs',
+        '$WTF_DIR',
+        '$JAVASCRIPTCORE_DIR/API',
+        '$JAVASCRIPTCORE_DIR/bindings',
+        '$JAVASCRIPTCORE_DIR/bindings/c',
+        '$JAVASCRIPTCORE_DIR/bindings/jni',
+        '$WEBKIT_DIR/pending',
+        '$WEBKIT_DIR/pending/wtf',
+        '$ICU38_DIR/public/common',
+        '$ICU38_DIR/public/i18n',
+        '$WEBKIT_DIR',
+        '#/..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'HAVE_CONFIG_H',
+        '__STD_C',
+        'CRASH=__debugbreak',
+        'U_STATIC_IMPLEMENTATION',
+        '_WIN32_WINNT=0x0600',
+        'WINVER=0x0600',
+    ],
+    CCFLAGS = [
+        '/TP',
+
+        '/WX',
+        '/Wp64',
+
+        '/wd4127',
+        '/wd4355',
+        '/wd4510',
+        '/wd4512',
+        '/wd4610',
+        '/wd4706',
+    ],
+)
+
+wtf_inputs = [
+    '$WTF_DIR/Assertions.cpp',
+    '$WTF_DIR/unicode/UTF8.cpp',
+    '$WTF_DIR/TCSystemAlloc.cpp',
+    '$WTF_DIR/HashTable.cpp',
+]
+
+env.ChromeStaticLibrary('WTF', wtf_inputs)
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index aeb9ebc..227f95e 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -1,325 +1,325 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPDEFINES = [
-        'NOGDI',
-    ],
-
-    CCFLAGS = [
-        '/TP',
-
-        '/wd4291',
-        '/wd4099',
-        '/wd4996',
-        '/wd4521',
-        '/wd4244',
-        '/wd4800',
-    ],
-)
-
-inputs = [
-    '$DERIVED_DIR/V8MimeType.cpp',
-    '$DERIVED_DIR/V8MimeTypeArray.cpp',
-    '$PORT_DIR/bridge/V8Bridge.cpp',
-    '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp',
-    '$PORT_DIR/bindings/v8/v8_proxy.cpp',
-    '$PORT_DIR/bindings/v8/v8_nodefilter.cpp',
-    '$PORT_DIR/bindings/v8/v8_index.cpp',
-    '$PORT_DIR/bindings/v8/v8_events.cpp',
-    '$PORT_DIR/bindings/v8/v8_custom.cpp',
-    '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
-    '$PORT_DIR/page/inspector/InspectorController.cpp',
-    '$PORT_DIR/bindings/v8/v8_npobject.cpp',
-    '$PORT_DIR/bindings/v8/v8_np_utils.cpp',
-    '$PORT_DIR/bindings/v8/v8_helpers.cpp',
-    '$PORT_DIR/bindings/v8/npruntime.cpp',
-    '$PORT_DIR/bindings/v8/np_v8object.cpp',
-    '$PORT_DIR/page/Navigator.cpp',
-    '$PORT_DIR/page/Location.cpp',
-    '$SHARED_DIR/PausedTimeouts.cpp',
-    '$DERIVED_DIR/XPathGrammar.cpp',
-    '$DERIVED_DIR/CSSGrammar.cpp',
-    '$DERIVED_DIR/XMLNames.cpp',
-    '$DERIVED_DIR/XLinkNames.cpp',
-    '$DERIVED_DIR/V8XSLTProcessor.cpp',
-    '$DERIVED_DIR/V8XPathResult.cpp',
-    '$DERIVED_DIR/V8XPathNSResolver.cpp',
-    '$DERIVED_DIR/V8XPathExpression.cpp',
-    '$DERIVED_DIR/V8XPathException.cpp',
-    '$DERIVED_DIR/V8XPathEvaluator.cpp',
-    '$DERIVED_DIR/V8XMLSerializer.cpp',
-    '$DERIVED_DIR/V8XMLHttpRequestException.cpp',
-    '$DERIVED_DIR/V8XMLHttpRequest.cpp',
-    '$DERIVED_DIR/V8WheelEvent.cpp',
-    '$DERIVED_DIR/V8UndetectableHTMLCollection.cpp',
-    '$DERIVED_DIR/V8UIEvent.cpp',
-    '$DERIVED_DIR/V8TreeWalker.cpp',
-    '$DERIVED_DIR/V8TextEvent.cpp',
-    '$DERIVED_DIR/V8Text.cpp',
-    '$DERIVED_DIR/V8SVGZoomEvent.cpp',
-    '$DERIVED_DIR/V8SVGViewElement.cpp',
-    '$DERIVED_DIR/V8SVGUseElement.cpp',
-    '$DERIVED_DIR/V8SVGURIReference.cpp',
-    '$DERIVED_DIR/V8SVGUnitTypes.cpp',
-    '$DERIVED_DIR/V8SVGTSpanElement.cpp',
-    '$DERIVED_DIR/V8SVGTRefElement.cpp',
-    '$DERIVED_DIR/V8SVGTransformList.cpp',
-    '$DERIVED_DIR/V8SVGTransform.cpp',
-    '$DERIVED_DIR/V8SVGTitleElement.cpp',
-    '$DERIVED_DIR/V8SVGTextPositioningElement.cpp',
-    '$DERIVED_DIR/V8SVGTextPathElement.cpp',
-    '$DERIVED_DIR/V8SVGTextElement.cpp',
-    '$DERIVED_DIR/V8SVGTextContentElement.cpp',
-    '$DERIVED_DIR/V8SVGSymbolElement.cpp',
-    '$DERIVED_DIR/V8SVGSwitchElement.cpp',
-    '$DERIVED_DIR/V8SVGSVGElement.cpp',
-    '$DERIVED_DIR/V8SVGStyleElement.cpp',
-    '$DERIVED_DIR/V8SVGStringList.cpp',
-    '$DERIVED_DIR/V8SVGStopElement.cpp',
-    '$DERIVED_DIR/V8SVGScriptElement.cpp',
-    '$DERIVED_DIR/V8SVGRenderingIntent.cpp',
-    '$DERIVED_DIR/V8SVGRectElement.cpp',
-    '$DERIVED_DIR/V8SVGRect.cpp',
-    '$DERIVED_DIR/V8SVGRadialGradientElement.cpp',
-    '$DERIVED_DIR/V8SVGPreserveAspectRatio.cpp',
-    '$DERIVED_DIR/V8SVGPolylineElement.cpp',
-    '$DERIVED_DIR/V8SVGPolygonElement.cpp',
-    '$DERIVED_DIR/V8SVGPointList.cpp',
-    '$DERIVED_DIR/V8SVGPoint.cpp',
-    '$DERIVED_DIR/V8SVGPatternElement.cpp',
-    '$DERIVED_DIR/V8SVGPathSegMovetoRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegMovetoAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegList.cpp',
-    '$DERIVED_DIR/V8SVGPathSegLinetoVerticalRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegLinetoVerticalAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegLinetoRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegLinetoHorizontalRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegLinetoHorizontalAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegLinetoAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticSmoothRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticSmoothAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicSmoothRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicSmoothAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSegClosePath.cpp',
-    '$DERIVED_DIR/V8SVGPathSegArcRel.cpp',
-    '$DERIVED_DIR/V8SVGPathSegArcAbs.cpp',
-    '$DERIVED_DIR/V8SVGPathSeg.cpp',
-    '$DERIVED_DIR/V8SVGPathElement.cpp',
-    '$DERIVED_DIR/V8SVGPaint.cpp',
-    '$DERIVED_DIR/V8SVGNumberList.cpp',
-    '$DERIVED_DIR/V8SVGNumber.cpp',
-    '$DERIVED_DIR/V8SVGMetadataElement.cpp',
-    '$DERIVED_DIR/V8SVGMatrix.cpp',
-    '$DERIVED_DIR/V8SVGMaskElement.cpp',
-    '$DERIVED_DIR/V8SVGMarkerElement.cpp',
-    '$DERIVED_DIR/V8SVGLineElement.cpp',
-    '$DERIVED_DIR/V8SVGLinearGradientElement.cpp',
-    '$DERIVED_DIR/V8SVGLengthList.cpp',
-    '$DERIVED_DIR/V8SVGLength.cpp',
-    '$DERIVED_DIR/V8SVGImageElement.cpp',
-    '$DERIVED_DIR/V8SVGGradientElement.cpp',
-    '$DERIVED_DIR/V8SVGGElement.cpp',
-    '$DERIVED_DIR/V8SVGForeignObjectElement.cpp',
-    '$DERIVED_DIR/V8SVGFontFaceUriElement.cpp',
-    '$DERIVED_DIR/V8SVGFontFaceSrcElement.cpp',
-    '$DERIVED_DIR/V8SVGFontFaceNameElement.cpp',
-    '$DERIVED_DIR/V8SVGFontFaceFormatElement.cpp',
-    '$DERIVED_DIR/V8SVGFontFaceElement.cpp',
-    '$DERIVED_DIR/V8SVGException.cpp',
-    '$DERIVED_DIR/V8SVGEllipseElement.cpp',
-    '$DERIVED_DIR/V8SVGElementInstanceList.cpp',
-    '$DERIVED_DIR/V8SVGElementInstance.cpp',
-    '$DERIVED_DIR/V8SVGElement.cpp',
-    '$DERIVED_DIR/V8SVGDocument.cpp',
-    '$DERIVED_DIR/V8SVGDescElement.cpp',
-    '$DERIVED_DIR/V8SVGDefsElement.cpp',
-    '$DERIVED_DIR/V8SVGDefinitionSrcElement.cpp',
-    '$DERIVED_DIR/V8SVGCursorElement.cpp',
-    '$DERIVED_DIR/V8SVGColor.cpp',
-    '$DERIVED_DIR/V8SVGClipPathElement.cpp',
-    '$DERIVED_DIR/V8SVGCircleElement.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedTransformList.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedString.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedRect.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedPreserveAspectRatio.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedPoints.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedNumberList.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedNumber.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedLengthList.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedLength.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedInteger.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedEnumeration.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedBoolean.cpp',
-    '$DERIVED_DIR/V8SVGAnimatedAngle.cpp',
-    '$DERIVED_DIR/V8SVGAngle.cpp',
-    '$DERIVED_DIR/V8SVGAElement.cpp',
-    '$DERIVED_DIR/V8StyleSheetList.cpp',
-    '$DERIVED_DIR/V8StyleSheet.cpp',
-    '$DERIVED_DIR/V8Screen.cpp',
-    '$DERIVED_DIR/V8RGBColor.cpp',
-    '$DERIVED_DIR/V8Rect.cpp',
-    '$DERIVED_DIR/V8RangeException.cpp',
-    '$DERIVED_DIR/V8Range.cpp',
-    '$DERIVED_DIR/V8ProgressEvent.cpp',
-    '$DERIVED_DIR/V8ProcessingInstruction.cpp',
-    '$DERIVED_DIR/V8PluginArray.cpp',
-    '$DERIVED_DIR/V8Plugin.cpp',
-    '$DERIVED_DIR/V8OverflowEvent.cpp',
-    '$DERIVED_DIR/V8Notation.cpp',
-    '$DERIVED_DIR/V8NodeList.cpp',
-    '$DERIVED_DIR/V8NodeIterator.cpp',
-    '$DERIVED_DIR/V8NodeFilter.cpp',
-    '$DERIVED_DIR/V8Node.cpp',
-    '$DERIVED_DIR/V8Navigator.cpp',
-    '$DERIVED_DIR/V8NamedNodeMap.cpp',
-    '$DERIVED_DIR/V8MutationEvent.cpp',
-    '$DERIVED_DIR/V8MouseEvent.cpp',
-    '$DERIVED_DIR/V8MessageEvent.cpp',
-    '$DERIVED_DIR/V8MediaList.cpp',
-    '$DERIVED_DIR/V8Location.cpp',
-    '$DERIVED_DIR/V8KeyboardEvent.cpp',
-    '$DERIVED_DIR/V8InspectorController.cpp',
-    '$DERIVED_DIR/V8HTMLUListElement.cpp',
-    '$DERIVED_DIR/V8HTMLTitleElement.cpp',
-    '$DERIVED_DIR/V8HTMLTextAreaElement.cpp',
-    '$DERIVED_DIR/V8HTMLTableSectionElement.cpp',
-    '$DERIVED_DIR/V8HTMLTableRowElement.cpp',
-    '$DERIVED_DIR/V8HTMLTableElement.cpp',
-    '$DERIVED_DIR/V8HTMLTableColElement.cpp',
-    '$DERIVED_DIR/V8HTMLTableCellElement.cpp',
-    '$DERIVED_DIR/V8HTMLTableCaptionElement.cpp',
-    '$DERIVED_DIR/V8HTMLStyleElement.cpp',
-    '$DERIVED_DIR/V8HTMLSelectionInputElement.cpp',
-    '$DERIVED_DIR/V8HTMLSelectElement.cpp',
-    '$DERIVED_DIR/V8HTMLScriptElement.cpp',
-    '$DERIVED_DIR/V8HTMLQuoteElement.cpp',
-    '$DERIVED_DIR/V8HTMLPreElement.cpp',
-    '$DERIVED_DIR/V8HTMLParamElement.cpp',
-    '$DERIVED_DIR/V8HTMLParagraphElement.cpp',
-    '$DERIVED_DIR/V8HTMLOptionsCollection.cpp',
-    '$DERIVED_DIR/V8HTMLOptionElement.cpp',
-    '$DERIVED_DIR/V8HTMLOptGroupElement.cpp',
-    '$DERIVED_DIR/V8HTMLOListElement.cpp',
-    '$DERIVED_DIR/V8HTMLObjectElement.cpp',
-    '$DERIVED_DIR/V8HTMLModElement.cpp',
-    '$DERIVED_DIR/V8HTMLMetaElement.cpp',
-    '$DERIVED_DIR/V8HTMLMenuElement.cpp',
-    '$DERIVED_DIR/V8HTMLMarqueeElement.cpp',
-    '$DERIVED_DIR/V8HTMLMapElement.cpp',
-    '$DERIVED_DIR/V8HTMLLinkElement.cpp',
-    '$DERIVED_DIR/V8HTMLLIElement.cpp',
-    '$DERIVED_DIR/V8HTMLLegendElement.cpp',
-    '$DERIVED_DIR/V8HTMLLabelElement.cpp',
-    '$DERIVED_DIR/V8HTMLIsIndexElement.cpp',
-    '$DERIVED_DIR/V8HTMLInputElement.cpp',
-    '$DERIVED_DIR/V8HTMLImageElement.cpp',
-    '$DERIVED_DIR/V8HTMLIFrameElement.cpp',
-    '$DERIVED_DIR/V8HTMLHtmlElement.cpp',
-    '$DERIVED_DIR/V8HTMLHRElement.cpp',
-    '$DERIVED_DIR/V8HTMLHeadingElement.cpp',
-    '$DERIVED_DIR/V8HTMLHeadElement.cpp',
-    '$DERIVED_DIR/V8HTMLFrameSetElement.cpp',
-    '$DERIVED_DIR/V8HTMLFrameElement.cpp',
-    '$DERIVED_DIR/V8HTMLFormElement.cpp',
-    '$DERIVED_DIR/V8HTMLFontElement.cpp',
-    '$DERIVED_DIR/V8HTMLFieldSetElement.cpp',
-    '$DERIVED_DIR/V8HTMLEmbedElement.cpp',
-    '$DERIVED_DIR/V8HTMLElement.cpp',
-    '$DERIVED_DIR/V8HTMLDocument.cpp',
-    '$DERIVED_DIR/V8HTMLDListElement.cpp',
-    '$DERIVED_DIR/V8HTMLDivElement.cpp',
-    '$DERIVED_DIR/V8HTMLDirectoryElement.cpp',
-    '$DERIVED_DIR/V8HTMLCollection.cpp',
-    '$DERIVED_DIR/V8HTMLCanvasElement.cpp',
-    '$DERIVED_DIR/V8HTMLButtonElement.cpp',
-    '$DERIVED_DIR/V8HTMLBRElement.cpp',
-    '$DERIVED_DIR/V8HTMLBodyElement.cpp',
-    '$DERIVED_DIR/V8HTMLBlockquoteElement.cpp',
-    '$DERIVED_DIR/V8HTMLBaseFontElement.cpp',
-    '$DERIVED_DIR/V8HTMLBaseElement.cpp',
-    '$DERIVED_DIR/V8HTMLAreaElement.cpp',
-    '$DERIVED_DIR/V8HTMLAppletElement.cpp',
-    '$DERIVED_DIR/V8HTMLAnchorElement.cpp',
-    '$DERIVED_DIR/V8History.cpp',
-    '$DERIVED_DIR/V8EventTargetNode.cpp',
-    '$DERIVED_DIR/V8EventException.cpp',
-    '$DERIVED_DIR/V8Event.cpp',
-    '$DERIVED_DIR/V8EntityReference.cpp',
-    '$DERIVED_DIR/V8Entity.cpp',
-    '$DERIVED_DIR/V8Element.cpp',
-    '$DERIVED_DIR/V8DOMWindow.cpp',
-    '$DERIVED_DIR/V8DOMSelection.cpp',
-    '$DERIVED_DIR/V8DOMParser.cpp',
-    '$DERIVED_DIR/V8DOMImplementation.cpp',
-    '$DERIVED_DIR/V8DOMCoreException.cpp',
-    '$DERIVED_DIR/V8DocumentType.cpp',
-    '$DERIVED_DIR/V8DocumentFragment.cpp',
-    '$DERIVED_DIR/V8Document.cpp',
-    '$DERIVED_DIR/V8CSSValueList.cpp',
-    '$DERIVED_DIR/V8CSSValue.cpp',
-    '$DERIVED_DIR/V8CSSStyleSheet.cpp',
-    '$DERIVED_DIR/V8CSSStyleRule.cpp',
-    '$DERIVED_DIR/V8CSSStyleDeclaration.cpp',
-    '$DERIVED_DIR/V8CSSRuleList.cpp',
-    '$DERIVED_DIR/V8CSSRule.cpp',
-    '$DERIVED_DIR/V8CSSPrimitiveValue.cpp',
-    '$DERIVED_DIR/V8CSSPageRule.cpp',
-    '$DERIVED_DIR/V8CSSMediaRule.cpp',
-    '$DERIVED_DIR/V8CSSImportRule.cpp',
-    '$DERIVED_DIR/V8CSSFontFaceRule.cpp',
-    '$DERIVED_DIR/V8CSSCharsetRule.cpp',
-    '$DERIVED_DIR/V8Counter.cpp',
-    '$DERIVED_DIR/V8Console.cpp',
-    '$DERIVED_DIR/V8Comment.cpp',
-    '$DERIVED_DIR/V8Clipboard.cpp',
-    '$DERIVED_DIR/V8CharacterData.cpp',
-    '$DERIVED_DIR/V8CDATASection.cpp',
-    '$DERIVED_DIR/V8CanvasRenderingContext2D.cpp',
-    '$DERIVED_DIR/V8CanvasPattern.cpp',
-    '$DERIVED_DIR/V8CanvasGradient.cpp',
-    '$DERIVED_DIR/V8BarInfo.cpp',
-    '$DERIVED_DIR/V8Attr.cpp',
-    '$DERIVED_DIR/UserAgentStyleSheetsData.cpp',
-    '$DERIVED_DIR/SVGNames.cpp',
-    '$DERIVED_DIR/SVGElementFactory.cpp',
-    '$DERIVED_DIR/HTMLNames.cpp',
-]
-
-
-env.ChromeStaticLibrary('V8Bindings', inputs)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+
+env.Prepend(
+    CPPDEFINES = [
+        'NOGDI',
+    ],
+
+    CCFLAGS = [
+        '/TP',
+
+        '/wd4291',
+        '/wd4099',
+        '/wd4996',
+        '/wd4521',
+        '/wd4244',
+        '/wd4800',
+    ],
+)
+
+inputs = [
+    '$DERIVED_DIR/V8MimeType.cpp',
+    '$DERIVED_DIR/V8MimeTypeArray.cpp',
+    '$PORT_DIR/bridge/V8Bridge.cpp',
+    '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp',
+    '$PORT_DIR/bindings/v8/v8_proxy.cpp',
+    '$PORT_DIR/bindings/v8/v8_nodefilter.cpp',
+    '$PORT_DIR/bindings/v8/v8_index.cpp',
+    '$PORT_DIR/bindings/v8/v8_events.cpp',
+    '$PORT_DIR/bindings/v8/v8_custom.cpp',
+    '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
+    '$PORT_DIR/page/inspector/InspectorController.cpp',
+    '$PORT_DIR/bindings/v8/v8_npobject.cpp',
+    '$PORT_DIR/bindings/v8/v8_np_utils.cpp',
+    '$PORT_DIR/bindings/v8/v8_helpers.cpp',
+    '$PORT_DIR/bindings/v8/npruntime.cpp',
+    '$PORT_DIR/bindings/v8/np_v8object.cpp',
+    '$PORT_DIR/page/Navigator.cpp',
+    '$PORT_DIR/page/Location.cpp',
+    '$SHARED_DIR/PausedTimeouts.cpp',
+    '$DERIVED_DIR/XPathGrammar.cpp',
+    '$DERIVED_DIR/CSSGrammar.cpp',
+    '$DERIVED_DIR/XMLNames.cpp',
+    '$DERIVED_DIR/XLinkNames.cpp',
+    '$DERIVED_DIR/V8XSLTProcessor.cpp',
+    '$DERIVED_DIR/V8XPathResult.cpp',
+    '$DERIVED_DIR/V8XPathNSResolver.cpp',
+    '$DERIVED_DIR/V8XPathExpression.cpp',
+    '$DERIVED_DIR/V8XPathException.cpp',
+    '$DERIVED_DIR/V8XPathEvaluator.cpp',
+    '$DERIVED_DIR/V8XMLSerializer.cpp',
+    '$DERIVED_DIR/V8XMLHttpRequestException.cpp',
+    '$DERIVED_DIR/V8XMLHttpRequest.cpp',
+    '$DERIVED_DIR/V8WheelEvent.cpp',
+    '$DERIVED_DIR/V8UndetectableHTMLCollection.cpp',
+    '$DERIVED_DIR/V8UIEvent.cpp',
+    '$DERIVED_DIR/V8TreeWalker.cpp',
+    '$DERIVED_DIR/V8TextEvent.cpp',
+    '$DERIVED_DIR/V8Text.cpp',
+    '$DERIVED_DIR/V8SVGZoomEvent.cpp',
+    '$DERIVED_DIR/V8SVGViewElement.cpp',
+    '$DERIVED_DIR/V8SVGUseElement.cpp',
+    '$DERIVED_DIR/V8SVGURIReference.cpp',
+    '$DERIVED_DIR/V8SVGUnitTypes.cpp',
+    '$DERIVED_DIR/V8SVGTSpanElement.cpp',
+    '$DERIVED_DIR/V8SVGTRefElement.cpp',
+    '$DERIVED_DIR/V8SVGTransformList.cpp',
+    '$DERIVED_DIR/V8SVGTransform.cpp',
+    '$DERIVED_DIR/V8SVGTitleElement.cpp',
+    '$DERIVED_DIR/V8SVGTextPositioningElement.cpp',
+    '$DERIVED_DIR/V8SVGTextPathElement.cpp',
+    '$DERIVED_DIR/V8SVGTextElement.cpp',
+    '$DERIVED_DIR/V8SVGTextContentElement.cpp',
+    '$DERIVED_DIR/V8SVGSymbolElement.cpp',
+    '$DERIVED_DIR/V8SVGSwitchElement.cpp',
+    '$DERIVED_DIR/V8SVGSVGElement.cpp',
+    '$DERIVED_DIR/V8SVGStyleElement.cpp',
+    '$DERIVED_DIR/V8SVGStringList.cpp',
+    '$DERIVED_DIR/V8SVGStopElement.cpp',
+    '$DERIVED_DIR/V8SVGScriptElement.cpp',
+    '$DERIVED_DIR/V8SVGRenderingIntent.cpp',
+    '$DERIVED_DIR/V8SVGRectElement.cpp',
+    '$DERIVED_DIR/V8SVGRect.cpp',
+    '$DERIVED_DIR/V8SVGRadialGradientElement.cpp',
+    '$DERIVED_DIR/V8SVGPreserveAspectRatio.cpp',
+    '$DERIVED_DIR/V8SVGPolylineElement.cpp',
+    '$DERIVED_DIR/V8SVGPolygonElement.cpp',
+    '$DERIVED_DIR/V8SVGPointList.cpp',
+    '$DERIVED_DIR/V8SVGPoint.cpp',
+    '$DERIVED_DIR/V8SVGPatternElement.cpp',
+    '$DERIVED_DIR/V8SVGPathSegMovetoRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegMovetoAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegList.cpp',
+    '$DERIVED_DIR/V8SVGPathSegLinetoVerticalRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegLinetoVerticalAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegLinetoRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegLinetoHorizontalRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegLinetoHorizontalAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegLinetoAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticSmoothRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticSmoothAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoQuadraticAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicSmoothRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicSmoothAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegCurvetoCubicAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSegClosePath.cpp',
+    '$DERIVED_DIR/V8SVGPathSegArcRel.cpp',
+    '$DERIVED_DIR/V8SVGPathSegArcAbs.cpp',
+    '$DERIVED_DIR/V8SVGPathSeg.cpp',
+    '$DERIVED_DIR/V8SVGPathElement.cpp',
+    '$DERIVED_DIR/V8SVGPaint.cpp',
+    '$DERIVED_DIR/V8SVGNumberList.cpp',
+    '$DERIVED_DIR/V8SVGNumber.cpp',
+    '$DERIVED_DIR/V8SVGMetadataElement.cpp',
+    '$DERIVED_DIR/V8SVGMatrix.cpp',
+    '$DERIVED_DIR/V8SVGMaskElement.cpp',
+    '$DERIVED_DIR/V8SVGMarkerElement.cpp',
+    '$DERIVED_DIR/V8SVGLineElement.cpp',
+    '$DERIVED_DIR/V8SVGLinearGradientElement.cpp',
+    '$DERIVED_DIR/V8SVGLengthList.cpp',
+    '$DERIVED_DIR/V8SVGLength.cpp',
+    '$DERIVED_DIR/V8SVGImageElement.cpp',
+    '$DERIVED_DIR/V8SVGGradientElement.cpp',
+    '$DERIVED_DIR/V8SVGGElement.cpp',
+    '$DERIVED_DIR/V8SVGForeignObjectElement.cpp',
+    '$DERIVED_DIR/V8SVGFontFaceUriElement.cpp',
+    '$DERIVED_DIR/V8SVGFontFaceSrcElement.cpp',
+    '$DERIVED_DIR/V8SVGFontFaceNameElement.cpp',
+    '$DERIVED_DIR/V8SVGFontFaceFormatElement.cpp',
+    '$DERIVED_DIR/V8SVGFontFaceElement.cpp',
+    '$DERIVED_DIR/V8SVGException.cpp',
+    '$DERIVED_DIR/V8SVGEllipseElement.cpp',
+    '$DERIVED_DIR/V8SVGElementInstanceList.cpp',
+    '$DERIVED_DIR/V8SVGElementInstance.cpp',
+    '$DERIVED_DIR/V8SVGElement.cpp',
+    '$DERIVED_DIR/V8SVGDocument.cpp',
+    '$DERIVED_DIR/V8SVGDescElement.cpp',
+    '$DERIVED_DIR/V8SVGDefsElement.cpp',
+    '$DERIVED_DIR/V8SVGDefinitionSrcElement.cpp',
+    '$DERIVED_DIR/V8SVGCursorElement.cpp',
+    '$DERIVED_DIR/V8SVGColor.cpp',
+    '$DERIVED_DIR/V8SVGClipPathElement.cpp',
+    '$DERIVED_DIR/V8SVGCircleElement.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedTransformList.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedString.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedRect.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedPreserveAspectRatio.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedPoints.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedNumberList.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedNumber.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedLengthList.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedLength.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedInteger.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedEnumeration.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedBoolean.cpp',
+    '$DERIVED_DIR/V8SVGAnimatedAngle.cpp',
+    '$DERIVED_DIR/V8SVGAngle.cpp',
+    '$DERIVED_DIR/V8SVGAElement.cpp',
+    '$DERIVED_DIR/V8StyleSheetList.cpp',
+    '$DERIVED_DIR/V8StyleSheet.cpp',
+    '$DERIVED_DIR/V8Screen.cpp',
+    '$DERIVED_DIR/V8RGBColor.cpp',
+    '$DERIVED_DIR/V8Rect.cpp',
+    '$DERIVED_DIR/V8RangeException.cpp',
+    '$DERIVED_DIR/V8Range.cpp',
+    '$DERIVED_DIR/V8ProgressEvent.cpp',
+    '$DERIVED_DIR/V8ProcessingInstruction.cpp',
+    '$DERIVED_DIR/V8PluginArray.cpp',
+    '$DERIVED_DIR/V8Plugin.cpp',
+    '$DERIVED_DIR/V8OverflowEvent.cpp',
+    '$DERIVED_DIR/V8Notation.cpp',
+    '$DERIVED_DIR/V8NodeList.cpp',
+    '$DERIVED_DIR/V8NodeIterator.cpp',
+    '$DERIVED_DIR/V8NodeFilter.cpp',
+    '$DERIVED_DIR/V8Node.cpp',
+    '$DERIVED_DIR/V8Navigator.cpp',
+    '$DERIVED_DIR/V8NamedNodeMap.cpp',
+    '$DERIVED_DIR/V8MutationEvent.cpp',
+    '$DERIVED_DIR/V8MouseEvent.cpp',
+    '$DERIVED_DIR/V8MessageEvent.cpp',
+    '$DERIVED_DIR/V8MediaList.cpp',
+    '$DERIVED_DIR/V8Location.cpp',
+    '$DERIVED_DIR/V8KeyboardEvent.cpp',
+    '$DERIVED_DIR/V8InspectorController.cpp',
+    '$DERIVED_DIR/V8HTMLUListElement.cpp',
+    '$DERIVED_DIR/V8HTMLTitleElement.cpp',
+    '$DERIVED_DIR/V8HTMLTextAreaElement.cpp',
+    '$DERIVED_DIR/V8HTMLTableSectionElement.cpp',
+    '$DERIVED_DIR/V8HTMLTableRowElement.cpp',
+    '$DERIVED_DIR/V8HTMLTableElement.cpp',
+    '$DERIVED_DIR/V8HTMLTableColElement.cpp',
+    '$DERIVED_DIR/V8HTMLTableCellElement.cpp',
+    '$DERIVED_DIR/V8HTMLTableCaptionElement.cpp',
+    '$DERIVED_DIR/V8HTMLStyleElement.cpp',
+    '$DERIVED_DIR/V8HTMLSelectionInputElement.cpp',
+    '$DERIVED_DIR/V8HTMLSelectElement.cpp',
+    '$DERIVED_DIR/V8HTMLScriptElement.cpp',
+    '$DERIVED_DIR/V8HTMLQuoteElement.cpp',
+    '$DERIVED_DIR/V8HTMLPreElement.cpp',
+    '$DERIVED_DIR/V8HTMLParamElement.cpp',
+    '$DERIVED_DIR/V8HTMLParagraphElement.cpp',
+    '$DERIVED_DIR/V8HTMLOptionsCollection.cpp',
+    '$DERIVED_DIR/V8HTMLOptionElement.cpp',
+    '$DERIVED_DIR/V8HTMLOptGroupElement.cpp',
+    '$DERIVED_DIR/V8HTMLOListElement.cpp',
+    '$DERIVED_DIR/V8HTMLObjectElement.cpp',
+    '$DERIVED_DIR/V8HTMLModElement.cpp',
+    '$DERIVED_DIR/V8HTMLMetaElement.cpp',
+    '$DERIVED_DIR/V8HTMLMenuElement.cpp',
+    '$DERIVED_DIR/V8HTMLMarqueeElement.cpp',
+    '$DERIVED_DIR/V8HTMLMapElement.cpp',
+    '$DERIVED_DIR/V8HTMLLinkElement.cpp',
+    '$DERIVED_DIR/V8HTMLLIElement.cpp',
+    '$DERIVED_DIR/V8HTMLLegendElement.cpp',
+    '$DERIVED_DIR/V8HTMLLabelElement.cpp',
+    '$DERIVED_DIR/V8HTMLIsIndexElement.cpp',
+    '$DERIVED_DIR/V8HTMLInputElement.cpp',
+    '$DERIVED_DIR/V8HTMLImageElement.cpp',
+    '$DERIVED_DIR/V8HTMLIFrameElement.cpp',
+    '$DERIVED_DIR/V8HTMLHtmlElement.cpp',
+    '$DERIVED_DIR/V8HTMLHRElement.cpp',
+    '$DERIVED_DIR/V8HTMLHeadingElement.cpp',
+    '$DERIVED_DIR/V8HTMLHeadElement.cpp',
+    '$DERIVED_DIR/V8HTMLFrameSetElement.cpp',
+    '$DERIVED_DIR/V8HTMLFrameElement.cpp',
+    '$DERIVED_DIR/V8HTMLFormElement.cpp',
+    '$DERIVED_DIR/V8HTMLFontElement.cpp',
+    '$DERIVED_DIR/V8HTMLFieldSetElement.cpp',
+    '$DERIVED_DIR/V8HTMLEmbedElement.cpp',
+    '$DERIVED_DIR/V8HTMLElement.cpp',
+    '$DERIVED_DIR/V8HTMLDocument.cpp',
+    '$DERIVED_DIR/V8HTMLDListElement.cpp',
+    '$DERIVED_DIR/V8HTMLDivElement.cpp',
+    '$DERIVED_DIR/V8HTMLDirectoryElement.cpp',
+    '$DERIVED_DIR/V8HTMLCollection.cpp',
+    '$DERIVED_DIR/V8HTMLCanvasElement.cpp',
+    '$DERIVED_DIR/V8HTMLButtonElement.cpp',
+    '$DERIVED_DIR/V8HTMLBRElement.cpp',
+    '$DERIVED_DIR/V8HTMLBodyElement.cpp',
+    '$DERIVED_DIR/V8HTMLBlockquoteElement.cpp',
+    '$DERIVED_DIR/V8HTMLBaseFontElement.cpp',
+    '$DERIVED_DIR/V8HTMLBaseElement.cpp',
+    '$DERIVED_DIR/V8HTMLAreaElement.cpp',
+    '$DERIVED_DIR/V8HTMLAppletElement.cpp',
+    '$DERIVED_DIR/V8HTMLAnchorElement.cpp',
+    '$DERIVED_DIR/V8History.cpp',
+    '$DERIVED_DIR/V8EventTargetNode.cpp',
+    '$DERIVED_DIR/V8EventException.cpp',
+    '$DERIVED_DIR/V8Event.cpp',
+    '$DERIVED_DIR/V8EntityReference.cpp',
+    '$DERIVED_DIR/V8Entity.cpp',
+    '$DERIVED_DIR/V8Element.cpp',
+    '$DERIVED_DIR/V8DOMWindow.cpp',
+    '$DERIVED_DIR/V8DOMSelection.cpp',
+    '$DERIVED_DIR/V8DOMParser.cpp',
+    '$DERIVED_DIR/V8DOMImplementation.cpp',
+    '$DERIVED_DIR/V8DOMCoreException.cpp',
+    '$DERIVED_DIR/V8DocumentType.cpp',
+    '$DERIVED_DIR/V8DocumentFragment.cpp',
+    '$DERIVED_DIR/V8Document.cpp',
+    '$DERIVED_DIR/V8CSSValueList.cpp',
+    '$DERIVED_DIR/V8CSSValue.cpp',
+    '$DERIVED_DIR/V8CSSStyleSheet.cpp',
+    '$DERIVED_DIR/V8CSSStyleRule.cpp',
+    '$DERIVED_DIR/V8CSSStyleDeclaration.cpp',
+    '$DERIVED_DIR/V8CSSRuleList.cpp',
+    '$DERIVED_DIR/V8CSSRule.cpp',
+    '$DERIVED_DIR/V8CSSPrimitiveValue.cpp',
+    '$DERIVED_DIR/V8CSSPageRule.cpp',
+    '$DERIVED_DIR/V8CSSMediaRule.cpp',
+    '$DERIVED_DIR/V8CSSImportRule.cpp',
+    '$DERIVED_DIR/V8CSSFontFaceRule.cpp',
+    '$DERIVED_DIR/V8CSSCharsetRule.cpp',
+    '$DERIVED_DIR/V8Counter.cpp',
+    '$DERIVED_DIR/V8Console.cpp',
+    '$DERIVED_DIR/V8Comment.cpp',
+    '$DERIVED_DIR/V8Clipboard.cpp',
+    '$DERIVED_DIR/V8CharacterData.cpp',
+    '$DERIVED_DIR/V8CDATASection.cpp',
+    '$DERIVED_DIR/V8CanvasRenderingContext2D.cpp',
+    '$DERIVED_DIR/V8CanvasPattern.cpp',
+    '$DERIVED_DIR/V8CanvasGradient.cpp',
+    '$DERIVED_DIR/V8BarInfo.cpp',
+    '$DERIVED_DIR/V8Attr.cpp',
+    '$DERIVED_DIR/UserAgentStyleSheetsData.cpp',
+    '$DERIVED_DIR/SVGNames.cpp',
+    '$DERIVED_DIR/SVGElementFactory.cpp',
+    '$DERIVED_DIR/HTMLNames.cpp',
+]
+
+
+env.ChromeStaticLibrary('V8Bindings', inputs)
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index e184d27..a421e6b 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -1,702 +1,702 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Append(
-    CCFLAGS = [
-        '/TP',
-
-        '/wd4138',
-        '/wd4244',
-        '/wd4291',
-        '/wd4305',
-        '/wd4521',
-        '/wd4099',
-        '/wd4800',
-    ],
-)
-
-
-env_p = env.Clone()
-env_p.Append(CCFLAGS='/Ylwebcore')
-pch, obj = env_p.PCH('../precompiled_webkit.cc')
-env['PCH'] = pch
-env['PCHSTOP'] = 'precompiled_webkit.h'
-env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
-
-
-input_files = [
-    '$PENDING_DIR/JSSVGLazyEventListener.cpp',
-
-    '$WEBCORE_DIR/css/CSSBorderImageValue.cpp',
-    '$WEBCORE_DIR/css/CSSCharsetRule.cpp',
-    '$WEBCORE_DIR/css/CSSComputedStyleDeclaration.cpp',
-    '$WEBCORE_DIR/css/CSSCursorImageValue.cpp',
-    '$WEBCORE_DIR/css/CSSFontFace.cpp',
-    '$WEBCORE_DIR/css/CSSFontFaceRule.cpp',
-    '$WEBCORE_DIR/css/CSSFontFaceSource.cpp',
-    '$WEBCORE_DIR/css/CSSFontFaceSrcValue.cpp',
-    '$PENDING_DIR/CSSFontSelector.cpp',
-    '$WEBCORE_DIR/css/CSSHelper.cpp',
-    '$WEBCORE_DIR/css/CSSImageValue.cpp',
-    '$WEBCORE_DIR/css/CSSImportRule.cpp',
-    '$WEBCORE_DIR/css/CSSInheritedValue.cpp',
-    '$WEBCORE_DIR/css/CSSInitialValue.cpp',
-    '$WEBCORE_DIR/css/CSSMediaRule.cpp',
-    '$WEBCORE_DIR/css/CSSMutableStyleDeclaration.cpp',
-    '$WEBCORE_DIR/css/CSSPageRule.cpp',
-    '$PENDING_DIR/CSSParser.cpp',
-    '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp',
-    '$WEBCORE_DIR/css/CSSProperty.cpp',
-    '$WEBCORE_DIR/css/CSSRule.cpp',
-    '$WEBCORE_DIR/css/CSSRuleList.cpp',
-    '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp',
-    '$WEBCORE_DIR/css/CSSSelector.cpp',
-    '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp',
-    '$WEBCORE_DIR/css/CSSStyleRule.cpp',
-    '$PENDING_DIR/CSSStyleSelector.cpp',
-    '$WEBCORE_DIR/css/CSSStyleSheet.cpp',
-    '$WEBCORE_DIR/css/CSSTimingFunctionValue.cpp',
-    '$WEBCORE_DIR/css/CSSTransformValue.cpp',
-    '$WEBCORE_DIR/css/CSSUnicodeRangeValue.cpp',
-    '$WEBCORE_DIR/css/CSSValueList.cpp',
-    '$WEBCORE_DIR/css/FontFamilyValue.cpp',
-    '$WEBCORE_DIR/css/FontValue.cpp',
-    '$WEBCORE_DIR/css/MediaFeatureNames.cpp',
-    '$WEBCORE_DIR/css/MediaList.cpp',
-    '$WEBCORE_DIR/css/MediaQuery.cpp',
-    '$WEBCORE_DIR/css/MediaQueryEvaluator.cpp',
-    '$WEBCORE_DIR/css/MediaQueryExp.cpp',
-    '$WEBCORE_DIR/css/ShadowValue.cpp',
-    '$WEBCORE_DIR/css/StyleBase.cpp',
-    '$WEBCORE_DIR/css/StyleList.cpp',
-    '$WEBCORE_DIR/css/StyleSheet.cpp',
-    '$WEBCORE_DIR/css/StyleSheetList.cpp',
-    '$WEBCORE_DIR/css/SVGCSSComputedStyleDeclaration.cpp',
-    '$WEBCORE_DIR/css/SVGCSSParser.cpp',
-    '$WEBCORE_DIR/css/SVGCSSStyleSelector.cpp',
-
-    '$WEBCORE_DIR/dom/Attr.cpp',
-    '$WEBCORE_DIR/dom/Attribute.cpp',
-    '$WEBCORE_DIR/dom/BeforeTextInsertedEvent.cpp',
-    '$WEBCORE_DIR/dom/BeforeUnloadEvent.cpp',
-    '$WEBCORE_DIR/dom/CDATASection.cpp',
-    '$PENDING_DIR/CharacterData.cpp',
-    '$WEBCORE_DIR/dom/ChildNodeList.cpp',
-    '$WEBCORE_DIR/dom/ClassNames.cpp',
-    '$WEBCORE_DIR/dom/ClassNodeList.cpp',
-    '$WEBCORE_DIR/dom/Clipboard.cpp',
-    '$WEBCORE_DIR/dom/ClipboardEvent.cpp',
-    '$WEBCORE_DIR/dom/Comment.cpp',
-    '$PENDING_DIR/ContainerNode.cpp',
-    '$WEBCORE_DIR/dom/CSSMappedAttributeDeclaration.cpp',
-    '$PENDING_DIR/Document.cpp',
-    '$WEBCORE_DIR/dom/DocumentFragment.cpp',
-    '$WEBCORE_DIR/dom/DocumentType.cpp',
-    '$WEBCORE_DIR/dom/DOMImplementation.cpp',
-    '$WEBCORE_DIR/dom/DynamicNodeList.cpp',
-    '$WEBCORE_DIR/dom/EditingText.cpp',
-    '$WEBCORE_DIR/dom/Element.cpp',
-    '$WEBCORE_DIR/dom/Entity.cpp',
-    '$WEBCORE_DIR/dom/EntityReference.cpp',
-    '$WEBCORE_DIR/dom/Event.cpp',
-    '$WEBCORE_DIR/dom/EventNames.cpp',
-    '$PENDING_DIR/EventTarget.cpp',
-    '$PENDING_DIR/EventTargetNode.cpp',
-    '$WEBCORE_DIR/dom/ExceptionBase.cpp',
-    '$WEBCORE_DIR/dom/ExceptionCode.cpp',
-    '$WEBCORE_DIR/dom/KeyboardEvent.cpp',
-    '$WEBCORE_DIR/dom/MappedAttribute.cpp',
-    '$WEBCORE_DIR/dom/MessageEvent.cpp',
-    '$WEBCORE_DIR/dom/MouseEvent.cpp',
-    '$WEBCORE_DIR/dom/MouseRelatedEvent.cpp',
-    '$WEBCORE_DIR/dom/MutationEvent.cpp',
-    '$PENDING_DIR/NamedAttrMap.cpp',
-    '$WEBCORE_DIR/dom/NamedMappedAttrMap.cpp',
-    '$WEBCORE_DIR/dom/NameNodeList.cpp',
-    '$PENDING_DIR/Node.cpp',
-    '$WEBCORE_DIR/dom/NodeFilter.cpp',
-    '$WEBCORE_DIR/dom/NodeFilterCondition.cpp',
-    '$WEBCORE_DIR/dom/NodeIterator.cpp',
-    '$WEBCORE_DIR/dom/Notation.cpp',
-    '$WEBCORE_DIR/dom/OverflowEvent.cpp',
-    '$WEBCORE_DIR/dom/Position.cpp',
-    '$WEBCORE_DIR/dom/PositionIterator.cpp',
-    '$WEBCORE_DIR/dom/ProcessingInstruction.cpp',
-    '$WEBCORE_DIR/dom/ProgressEvent.cpp',
-    '$WEBCORE_DIR/dom/QualifiedName.cpp',
-    '$WEBCORE_DIR/dom/Range.cpp',
-    '$WEBCORE_DIR/dom/RegisteredEventListener.cpp',
-    '$WEBCORE_DIR/dom/SelectorNodeList.cpp',
-    '$WEBCORE_DIR/dom/StaticNodeList.cpp',
-    '$WEBCORE_DIR/dom/StyledElement.cpp',
-    '$WEBCORE_DIR/dom/StyleElement.cpp',
-    '$WEBCORE_DIR/dom/TagNodeList.cpp',
-    '$WEBCORE_DIR/dom/Text.cpp',
-    '$WEBCORE_DIR/dom/TextEvent.cpp',
-    '$WEBCORE_DIR/dom/Traversal.cpp',
-    '$WEBCORE_DIR/dom/TreeWalker.cpp',
-    '$WEBCORE_DIR/dom/UIEvent.cpp',
-    '$WEBCORE_DIR/dom/UIEventWithKeyState.cpp',
-    '$WEBCORE_DIR/dom/WheelEvent.cpp',
-    '$PENDING_DIR/XMLTokenizer.cpp',
-
-    '$WEBCORE_DIR/editing/AppendNodeCommand.cpp',
-    '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp',
-    '$WEBCORE_DIR/editing/BreakBlockquoteCommand.cpp',
-    '$WEBCORE_DIR/editing/CompositeEditCommand.cpp',
-    '$WEBCORE_DIR/editing/CreateLinkCommand.cpp',
-    '$WEBCORE_DIR/editing/DeleteButton.cpp',
-    '$WEBCORE_DIR/editing/DeleteButtonController.cpp',
-    '$WEBCORE_DIR/editing/DeleteFromTextNodeCommand.cpp',
-    '$PENDING_DIR/DeleteSelectionCommand.cpp',
-    '$WEBCORE_DIR/editing/EditCommand.cpp',
-    '$WEBCORE_DIR/editing/Editor.cpp',
-    '$WEBCORE_DIR/editing/EditorCommand.cpp',
-    '$WEBCORE_DIR/editing/FormatBlockCommand.cpp',
-    '$WEBCORE_DIR/editing/htmlediting.cpp',
-    '$WEBCORE_DIR/editing/HTMLInterchange.cpp',
-    '$PENDING_DIR/IndentOutdentCommand.cpp',
-    '$WEBCORE_DIR/editing/InsertIntoTextNodeCommand.cpp',
-    '$WEBCORE_DIR/editing/InsertLineBreakCommand.cpp',
-    '$WEBCORE_DIR/editing/InsertListCommand.cpp',
-    '$WEBCORE_DIR/editing/InsertNodeBeforeCommand.cpp',
-    '$WEBCORE_DIR/editing/InsertParagraphSeparatorCommand.cpp',
-    '$WEBCORE_DIR/editing/InsertTextCommand.cpp',
-    '$WEBCORE_DIR/editing/JoinTextNodesCommand.cpp',
-    '$PENDING_DIR/markup.cpp',
-    '$WEBCORE_DIR/editing/MergeIdenticalElementsCommand.cpp',
-    '$WEBCORE_DIR/editing/ModifySelectionListLevel.cpp',
-    '$WEBCORE_DIR/editing/MoveSelectionCommand.cpp',
-    '$WEBCORE_DIR/editing/RemoveCSSPropertyCommand.cpp',
-    '$PENDING_DIR/RemoveFormatCommand.cpp',
-    '$WEBCORE_DIR/editing/RemoveNodeAttributeCommand.cpp',
-    '$WEBCORE_DIR/editing/RemoveNodeCommand.cpp',
-    '$WEBCORE_DIR/editing/RemoveNodePreservingChildrenCommand.cpp',
-    '$PENDING_DIR/ReplaceSelectionCommand.cpp',
-    '$PENDING_DIR/Selection.cpp',
-    '$WEBCORE_DIR/editing/SelectionController.cpp',
-    '$WEBCORE_DIR/editing/SetNodeAttributeCommand.cpp',
-    '$WEBCORE_DIR/editing/SmartReplaceICU.cpp',
-    '$WEBCORE_DIR/editing/SmartReplace.cpp',
-    '$WEBCORE_DIR/editing/SplitElementCommand.cpp',
-    '$WEBCORE_DIR/editing/SplitTextNodeCommand.cpp',
-    '$WEBCORE_DIR/editing/SplitTextNodeContainingElementCommand.cpp',
-    '$WEBCORE_DIR/editing/TextIterator.cpp',
-    '$WEBCORE_DIR/editing/TypingCommand.cpp',
-    '$WEBCORE_DIR/editing/UnlinkCommand.cpp',
-    '$WEBCORE_DIR/editing/visible_units.cpp',
-    '$WEBCORE_DIR/editing/VisiblePosition.cpp',
-    '$WEBCORE_DIR/editing/WrapContentsInDummySpanCommand.cpp',
-
-    '$WEBCORE_DIR/history/PageCache.cpp',
-    '$WEBCORE_DIR/history/HistoryItem.cpp',
-
-    '$PENDING_DIR/CanvasGradient.cpp',
-    '$PENDING_DIR/CanvasPattern.cpp',
-    '$PENDING_DIR/CanvasRenderingContext2D.cpp',
-    '$PENDING_DIR/CanvasStyle.cpp',
-    '$WEBCORE_DIR/html/FormDataList.cpp',
-    '$PENDING_DIR/HTMLAnchorElement.cpp',
-    '$PENDING_DIR/HTMLAppletElement.cpp',
-    '$PENDING_DIR/HTMLAreaElement.cpp',
-    '$WEBCORE_DIR/html/HTMLAudioElement.cpp',
-    '$WEBCORE_DIR/html/HTMLBaseElement.cpp',
-    '$WEBCORE_DIR/html/HTMLBaseFontElement.cpp',
-    '$WEBCORE_DIR/html/HTMLBlockquoteElement.cpp',
-    '$WEBCORE_DIR/html/HTMLBodyElement.cpp',
-    '$WEBCORE_DIR/html/HTMLBRElement.cpp',
-    '$WEBCORE_DIR/html/HTMLButtonElement.cpp',
-    '$PENDING_DIR/HTMLCanvasElement.cpp',
-    '$WEBCORE_DIR/html/HTMLCollection.cpp',
-    '$WEBCORE_DIR/html/HTMLDirectoryElement.cpp',
-    '$WEBCORE_DIR/html/HTMLDivElement.cpp',
-    '$WEBCORE_DIR/html/HTMLDListElement.cpp',
-    '$WEBCORE_DIR/html/HTMLDocument.cpp',
-    '$PENDING_DIR/HTMLElement.cpp',
-    '$WEBCORE_DIR/html/HTMLElementFactory.cpp',
-    '$PENDING_DIR/HTMLEmbedElement.cpp',
-    '$PENDING_DIR/HTMLFieldSetElement.cpp',
-    '$WEBCORE_DIR/html/HTMLFontElement.cpp',
-    '$WEBCORE_DIR/html/HTMLFormCollection.cpp',
-    '$WEBCORE_DIR/html/HTMLFormElement.cpp',
-    '$WEBCORE_DIR/html/HTMLFrameElement.cpp',
-    '$WEBCORE_DIR/html/HTMLFrameElementBase.cpp',
-    '$WEBCORE_DIR/html/HTMLFrameOwnerElement.cpp',
-    '$WEBCORE_DIR/html/HTMLFrameSetElement.cpp',
-    '$PENDING_DIR/HTMLGenericFormElement.cpp',
-    '$WEBCORE_DIR/html/HTMLHeadElement.cpp',
-    '$WEBCORE_DIR/html/HTMLHeadingElement.cpp',
-    '$WEBCORE_DIR/html/HTMLHRElement.cpp',
-    '$WEBCORE_DIR/html/HTMLHtmlElement.cpp',
-    '$WEBCORE_DIR/html/HTMLIFrameElement.cpp',
-    '$WEBCORE_DIR/html/HTMLImageElement.cpp',
-    '$WEBCORE_DIR/html/HTMLImageLoader.cpp',
-    '$PENDING_DIR/HTMLInputElement.cpp',
-    '$WEBCORE_DIR/html/HTMLIsIndexElement.cpp',
-    '$WEBCORE_DIR/html/HTMLKeygenElement.cpp',
-    '$WEBCORE_DIR/html/HTMLLabelElement.cpp',
-    '$PENDING_DIR/HTMLLegendElement.cpp',
-    '$WEBCORE_DIR/html/HTMLLIElement.cpp',
-    '$PENDING_DIR/HTMLLinkElement.cpp',
-    '$WEBCORE_DIR/html/HTMLMapElement.cpp',
-    '$WEBCORE_DIR/html/HTMLMarqueeElement.cpp',
-    '$WEBCORE_DIR/html/HTMLMediaElement.cpp',
-    '$WEBCORE_DIR/html/HTMLMenuElement.cpp',
-    '$WEBCORE_DIR/html/HTMLMetaElement.cpp',
-    '$WEBCORE_DIR/html/HTMLModElement.cpp',
-    '$WEBCORE_DIR/html/HTMLNameCollection.cpp',
-    '$PENDING_DIR/HTMLObjectElement.cpp',
-    '$WEBCORE_DIR/html/HTMLOListElement.cpp',
-    '$PENDING_DIR/HTMLOptGroupElement.cpp',
-    '$PENDING_DIR/HTMLOptionElement.cpp',
-    '$WEBCORE_DIR/html/HTMLOptionsCollection.cpp',
-    '$WEBCORE_DIR/html/HTMLParagraphElement.cpp',
-    '$WEBCORE_DIR/html/HTMLParamElement.cpp',
-    '$PENDING_DIR/HTMLParser.cpp',
-    '$WEBCORE_DIR/html/HTMLParserErrorCodes.cpp',
-    '$PENDING_DIR/HTMLPlugInElement.cpp',
-    '$WEBCORE_DIR/html/HTMLPreElement.cpp',
-    '$WEBCORE_DIR/html/HTMLQuoteElement.cpp',
-    '$PENDING_DIR/HTMLScriptElement.cpp',
-    '$WEBCORE_DIR/html/HTMLSelectElement.cpp',
-    '$WEBCORE_DIR/html/HTMLStyleElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTableCaptionElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTableCellElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTableColElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTableElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTablePartElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTableRowElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTableRowsCollection.cpp',
-    '$WEBCORE_DIR/html/HTMLTableSectionElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTextAreaElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTextFieldInnerElement.cpp',
-    '$WEBCORE_DIR/html/HTMLTitleElement.cpp',
-    '$PENDING_DIR/HTMLTokenizer.cpp',
-    '$WEBCORE_DIR/html/HTMLUListElement.cpp',
-    '$WEBCORE_DIR/html/HTMLVideoElement.cpp',
-    '$WEBCORE_DIR/html/HTMLViewSourceDocument.cpp',
-
-    '$WEBCORE_DIR/loader/Cache.cpp',
-    '$WEBCORE_DIR/loader/CachedCSSStyleSheet.cpp',
-    '$WEBCORE_DIR/loader/CachedFont.cpp',
-    '$WEBCORE_DIR/loader/CachedImage.cpp',
-    '$WEBCORE_DIR/loader/CachedResource.cpp',
-    '$WEBCORE_DIR/loader/CachedResourceClientWalker.cpp',
-    '$WEBCORE_DIR/loader/CachedScript.cpp',
-    '$WEBCORE_DIR/loader/CachedXBLDocument.cpp',
-    '$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
-    '$PENDING_DIR/DocLoader.cpp',
-    '$WEBCORE_DIR/loader/DocumentLoader.cpp',
-    '$WEBCORE_DIR/loader/FormState.cpp',
-    '$PENDING_DIR/FrameLoader.cpp',
-    '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp',
-    '$WEBCORE_DIR/loader/ImageDocument.cpp',
-    '$WEBCORE_DIR/loader/loader.cpp',
-    '$WEBCORE_DIR/loader/MainResourceLoader.cpp',
-    '$WEBCORE_DIR/loader/NavigationAction.cpp',
-    '$WEBCORE_DIR/loader/NetscapePlugInStreamLoader.cpp',
-    '$WEBCORE_DIR/loader/PluginDocument.cpp',
-    '$WEBCORE_DIR/loader/ProgressTracker.cpp',
-    '$WEBCORE_DIR/loader/Request.cpp',
-    '$WEBCORE_DIR/loader/ResourceLoader.cpp',
-    '$WEBCORE_DIR/loader/SubresourceLoader.cpp',
-    '$WEBCORE_DIR/loader/TextDocument.cpp',
-    '$PENDING_DIR/TextResourceDecoder.cpp',
-
-    '$WEBCORE_DIR/page/AnimationController.cpp',
-    '$WEBCORE_DIR/page/BarInfo.cpp',
-    '$PENDING_DIR/AXObjectCache.cpp',
-    '$WEBCORE_DIR/page/AnimationController.cpp',
-    '$PENDING_DIR/AccessibilityObject.cpp',
-    '$WEBCORE_DIR/page/BarInfo.cpp',
-    '$PENDING_DIR/Chrome.cpp',
-    '$WEBCORE_DIR/page/Console.cpp',
-    '$WEBCORE_DIR/page/ContextMenuController.cpp',
-    '$WEBCORE_DIR/page/DOMSelection.cpp',
-    '$PENDING_DIR/DOMWindow.cpp',
-    '$PENDING_DIR/DragController.cpp',
-    '$PENDING_DIR/EventHandler.cpp',
-    '$WEBCORE_DIR/page/FocusController.cpp',
-    '$PENDING_DIR/Frame.cpp',
-    '$WEBCORE_DIR/page/FrameTree.cpp',
-    '$PENDING_DIR/FrameView.cpp',
-    '$WEBCORE_DIR/page/History.cpp',
-    '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp',
-    '$PENDING_DIR/Page.cpp',
-    '$WEBCORE_DIR/page/Screen.cpp',
-    '$PENDING_DIR/Settings.cpp',
-    '$WEBCORE_DIR/page/WindowFeatures.cpp',
-
-    '$WEBCORE_DIR/platform/Arena.cpp',
-    '$WEBCORE_DIR/platform/ArrayImpl.cpp',
-    '$WEBCORE_DIR/platform/ContextMenu.cpp',
-    '$WEBCORE_DIR/platform/DeprecatedCString.cpp',
-    '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp',
-    '$PENDING_DIR/DeprecatedString.cpp',
-    '$WEBCORE_DIR/platform/DeprecatedStringList.cpp',
-    '$WEBCORE_DIR/platform/DeprecatedValueListImpl.cpp',
-    '$WEBCORE_DIR/platform/DragData.cpp',
-    '$WEBCORE_DIR/platform/DragImage.cpp',
-    '$WEBCORE_DIR/platform/FileChooser.cpp',
-    '$PENDING_DIR/Font.cpp',
-    '$PENDING_DIR/FontCache.cpp',
-    '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp',
-    '$WEBCORE_DIR/platform/graphics/FontFamily.cpp',
-    '$WEBCORE_DIR/platform/graphics/GlyphPageTreeNode.cpp',
-    '$PENDING_DIR/GlyphWidthMap.cpp',
-    '$PENDING_DIR/KURL.cpp',
-    '$WEBCORE_DIR/platform/Logging.cpp',
-    '$PORT_DIR/platform/MIMETypeRegistry.cpp',
-    '$WEBCORE_DIR/platform/ScrollBar.cpp',
-    '$PENDING_DIR/SecurityOrigin.cpp',
-    '$WEBCORE_DIR/platform/SharedBuffer.cpp',
-    '$WEBCORE_DIR/platform/Timer.cpp',
-    '$WEBCORE_DIR/platform/Widget.cpp',
-    '$WEBCORE_DIR/platform/graphics/AffineTransform.cpp',
-    '$PENDING_DIR/BitmapImage.cpp',
-    '$WEBCORE_DIR/platform/graphics/Color.cpp',
-    '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp',
-    '$WEBCORE_DIR/platform/graphics/FloatPoint3D.cpp',
-    '$WEBCORE_DIR/platform/graphics/FloatRect.cpp',
-    '$WEBCORE_DIR/platform/graphics/FloatSize.cpp',
-    '$WEBCORE_DIR/platform/graphics/FontData.cpp',
-    '$WEBCORE_DIR/platform/graphics/GraphicsContext.cpp',
-    '$WEBCORE_DIR/platform/graphics/GraphicsTypes.cpp',
-    '$WEBCORE_DIR/platform/graphics/Image.cpp',
-    '$WEBCORE_DIR/platform/graphics/IntRect.cpp',
-    '$WEBCORE_DIR/platform/graphics/Path.cpp',
-    '$WEBCORE_DIR/platform/graphics/PathTraversalState.cpp',
-    '$WEBCORE_DIR/platform/graphics/Pen.cpp',
-    '$WEBCORE_DIR/platform/graphics/SegmentedFontData.cpp',
-    '$PENDING_DIR/SimpleFontData.cpp',
-    '$WEBCORE_DIR/platform/network/AuthenticationChallenge.cpp',
-    '$WEBCORE_DIR/platform/network/Credential.cpp',
-    '$WEBCORE_DIR/platform/network/FormData.cpp',
-    '$WEBCORE_DIR/platform/network/HTTPParsers.cpp',
-    '$WEBCORE_DIR/platform/network/ProtectionSpace.cpp',
-    '$WEBCORE_DIR/platform/network/ResourceError.cpp',
-    '$WEBCORE_DIR/platform/network/ResourceRequestBase.cpp',
-    '$WEBCORE_DIR/platform/network/ResourceResponseBase.cpp',
-    '$PENDING_DIR/FileSystemWin.cpp',
-    '$PENDING_DIR/AtomicString.cpp',
-    '$WEBCORE_DIR/platform/text/Base64.cpp',
-    '$WEBCORE_DIR/platform/text/BidiContext.cpp',
-    '$WEBCORE_DIR/platform/text/CString.cpp',
-    '$WEBCORE_DIR/platform/text/RegularExpression.cpp',
-    '$WEBCORE_DIR/platform/text/SegmentedString.cpp',
-    '$PENDING_DIR/String.cpp',
-    '$PENDING_DIR/StringImpl.cpp',
-    '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp',
-    '$WEBCORE_DIR/platform/text/TextBoundariesICU.cpp',
-    '$WEBCORE_DIR/platform/text/TextBreakIteratorICU.cpp',
-    '$PENDING_DIR/TextCodec.cpp',
-    '$PENDING_DIR/TextCodecICU.cpp',
-    '$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp',
-    '$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp',
-    '$PENDING_DIR/TextCodecUTF16.cpp',
-    '$PENDING_DIR/TextDecoder.cpp',
-    '$WEBCORE_DIR/platform/text/TextEncoding.cpp',
-    '$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp',
-    '$WEBCORE_DIR/platform/text/TextStream.cpp',
-    '$WEBCORE_DIR/platform/text/UnicodeRange.cpp',
-
-    '$WEBCORE_DIR/rendering/AutoTableLayout.cpp',
-    '$PENDING_DIR/bidi.cpp',
-    '$WEBCORE_DIR/rendering/break_lines.cpp',
-    '$WEBCORE_DIR/rendering/CounterNode.cpp',
-    '$WEBCORE_DIR/rendering/EllipsisBox.cpp',
-    '$WEBCORE_DIR/rendering/FixedTableLayout.cpp',
-    '$WEBCORE_DIR/rendering/HitTestResult.cpp',
-    '$WEBCORE_DIR/rendering/InlineBox.cpp',
-    '$WEBCORE_DIR/rendering/InlineFlowBox.cpp',
-    '$WEBCORE_DIR/rendering/InlineTextBox.cpp',
-    '$WEBCORE_DIR/rendering/LayoutState.cpp',
-    '$WEBCORE_DIR/rendering/ListMarkerBox.cpp',
-    '$WEBCORE_DIR/rendering/MediaControlElements.cpp',
-    '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp',
-    '$WEBCORE_DIR/rendering/RenderApplet.cpp',
-    '$WEBCORE_DIR/rendering/RenderArena.cpp',
-    '$PENDING_DIR/RenderBlock.cpp',
-    '$WEBCORE_DIR/rendering/RenderBox.cpp',
-    '$WEBCORE_DIR/rendering/RenderBR.cpp',
-    '$PENDING_DIR/RenderButton.cpp',
-    '$WEBCORE_DIR/rendering/RenderContainer.cpp',
-    '$WEBCORE_DIR/rendering/RenderCounter.cpp',
-    '$WEBCORE_DIR/rendering/RenderFieldset.cpp',
-    '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp',
-    '$WEBCORE_DIR/rendering/RenderFlexibleBox.cpp',
-    '$WEBCORE_DIR/rendering/RenderFlow.cpp',
-    '$WEBCORE_DIR/rendering/RenderForeignObject.cpp',
-    '$WEBCORE_DIR/rendering/RenderFrame.cpp',
-    '$WEBCORE_DIR/rendering/RenderFrameSet.cpp',
-    '$WEBCORE_DIR/rendering/RenderHTMLCanvas.cpp',
-    '$WEBCORE_DIR/rendering/RenderImage.cpp',
-    '$WEBCORE_DIR/rendering/RenderInline.cpp',
-    '$WEBCORE_DIR/rendering/RenderLayer.cpp',
-    '$WEBCORE_DIR/rendering/RenderLegend.cpp',
-    '$WEBCORE_DIR/rendering/RenderListBox.cpp',
-    '$WEBCORE_DIR/rendering/RenderListItem.cpp',
-    '$WEBCORE_DIR/rendering/RenderListMarker.cpp',
-    '$PENDING_DIR/RenderMenuList.cpp',
-    '$PENDING_DIR/RenderObject.cpp',
-    '$WEBCORE_DIR/rendering/RenderPart.cpp',
-    '$PENDING_DIR/RenderPartObject.cpp',
-    '$WEBCORE_DIR/rendering/RenderPath.cpp',
-    '$WEBCORE_DIR/rendering/RenderReplaced.cpp',
-    '$WEBCORE_DIR/rendering/RenderSlider.cpp',
-    '$WEBCORE_DIR/rendering/RenderStyle.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGBlock.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGContainer.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGGradientStop.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGHiddenContainer.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGImage.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGInline.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGInlineText.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGRoot.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGText.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGTextPath.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGTransformableContainer.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGTSpan.cpp',
-    '$WEBCORE_DIR/rendering/RenderSVGViewportContainer.cpp',
-    '$PENDING_DIR/RenderTable.cpp',
-    '$WEBCORE_DIR/rendering/RenderTableCell.cpp',
-    '$WEBCORE_DIR/rendering/RenderTableCol.cpp',
-    '$WEBCORE_DIR/rendering/RenderTableRow.cpp',
-    '$WEBCORE_DIR/rendering/RenderTableSection.cpp',
-    '$PENDING_DIR/RenderText.cpp',
-    '$PENDING_DIR/RenderTextControl.cpp',
-    '$WEBCORE_DIR/rendering/RenderTextFragment.cpp',
-    '$WEBCORE_DIR/rendering/RenderTheme.cpp',
-    '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp',
-    '$WEBCORE_DIR/rendering/RenderVideo.cpp',
-    '$WEBCORE_DIR/rendering/RenderView.cpp',
-    '$WEBCORE_DIR/rendering/RenderWidget.cpp',
-    '$PENDING_DIR/RenderWordBreak.cpp',
-    '$WEBCORE_DIR/rendering/RootInlineBox.cpp',
-    '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp',
-    '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp',
-    '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp',
-    '$WEBCORE_DIR/rendering/SVGRenderStyle.cpp',
-    '$WEBCORE_DIR/rendering/SVGRenderStyleDefs.cpp',
-    '$WEBCORE_DIR/rendering/SVGRenderSupport.cpp',
-    '$WEBCORE_DIR/rendering/SVGRenderTreeAsText.cpp',
-    '$PENDING_DIR/SVGRootInlineBox.cpp',
-
-    '$WEBCORE_DIR/svg/ColorDistance.cpp',
-    '$WEBCORE_DIR/svg/SVGAElement.cpp',
-    '$WEBCORE_DIR/svg/SVGAngle.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimateColorElement.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimatedPathData.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimatedPoints.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimateElement.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimateMotionElement.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimateTransformElement.cpp',
-    '$WEBCORE_DIR/svg/SVGAnimationElement.cpp',
-    '$WEBCORE_DIR/svg/SVGCircleElement.cpp',
-    '$WEBCORE_DIR/svg/SVGClipPathElement.cpp',
-    '$WEBCORE_DIR/svg/SVGColor.cpp',
-    '$WEBCORE_DIR/svg/SVGComponentTransferFunctionElement.cpp',
-    '$WEBCORE_DIR/svg/SVGCursorElement.cpp',
-    '$WEBCORE_DIR/svg/SVGDefinitionSrcElement.cpp',
-    '$WEBCORE_DIR/svg/SVGDefsElement.cpp',
-    '$WEBCORE_DIR/svg/SVGDescElement.cpp',
-    '$WEBCORE_DIR/svg/SVGDocument.cpp',
-    '$PENDING_DIR/SVGDocumentExtensions.cpp',
-    '$WEBCORE_DIR/svg/SVGElement.cpp',
-    '$WEBCORE_DIR/svg/SVGElementInstance.cpp',
-    '$WEBCORE_DIR/svg/SVGElementInstanceList.cpp',
-    '$WEBCORE_DIR/svg/SVGEllipseElement.cpp',
-    '$WEBCORE_DIR/svg/SVGExternalResourcesRequired.cpp',
-    '$WEBCORE_DIR/svg/SVGFEBlendElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEColorMatrixElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEComponentTransferElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFECompositeElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEDiffuseLightingElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEDisplacementMapElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEDistantLightElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEFloodElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEFuncAElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEFuncBElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEFuncGElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEFuncRElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEGaussianBlurElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEImageElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFELightElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEMergeElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEMergeNodeElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEOffsetElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFEPointLightElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFESpecularLightingElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFESpotLightElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFETileElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFETurbulenceElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFilterElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFilterPrimitiveStandardAttributes.cpp',
-    '$WEBCORE_DIR/svg/SVGFitToViewBox.cpp',
-    '$WEBCORE_DIR/svg/SVGFont.cpp',
-    '$WEBCORE_DIR/svg/SVGFontData.cpp',
-    '$WEBCORE_DIR/svg/SVGFontElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFontFaceElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFontFaceFormatElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFontFaceNameElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFontFaceSrcElement.cpp',
-    '$WEBCORE_DIR/svg/SVGFontFaceUriElement.cpp',
-    '$WEBCORE_DIR/svg/SVGForeignObjectElement.cpp',
-    '$WEBCORE_DIR/svg/SVGGElement.cpp',
-    '$WEBCORE_DIR/svg/SVGGlyphElement.cpp',
-    '$WEBCORE_DIR/svg/SVGGradientElement.cpp',
-    '$WEBCORE_DIR/svg/SVGImageElement.cpp',
-    '$WEBCORE_DIR/svg/SVGImageLoader.cpp',
-    '$WEBCORE_DIR/svg/SVGLangSpace.cpp',
-    '$WEBCORE_DIR/svg/SVGLength.cpp',
-    '$WEBCORE_DIR/svg/SVGLengthList.cpp',
-    '$WEBCORE_DIR/svg/SVGLinearGradientElement.cpp',
-    '$WEBCORE_DIR/svg/SVGLineElement.cpp',
-    '$WEBCORE_DIR/svg/SVGLocatable.cpp',
-    '$WEBCORE_DIR/svg/SVGMarkerElement.cpp',
-    '$WEBCORE_DIR/svg/SVGMaskElement.cpp',
-    '$WEBCORE_DIR/svg/SVGMetadataElement.cpp',
-    '$WEBCORE_DIR/svg/SVGMissingGlyphElement.cpp',
-    '$WEBCORE_DIR/svg/SVGMPathElement.cpp',
-    '$WEBCORE_DIR/svg/SVGNumberList.cpp',
-    '$WEBCORE_DIR/svg/SVGPaint.cpp',
-    '$WEBCORE_DIR/svg/SVGParserUtilities.cpp',
-    '$WEBCORE_DIR/svg/SVGPathElement.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegArc.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegClosePath.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegCurvetoCubic.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegCurvetoCubicSmooth.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegCurvetoQuadratic.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegCurvetoQuadraticSmooth.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegLineto.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegLinetoHorizontal.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegLinetoVertical.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegList.cpp',
-    '$WEBCORE_DIR/svg/SVGPathSegMoveto.cpp',
-    '$WEBCORE_DIR/svg/SVGPatternElement.cpp',
-    '$WEBCORE_DIR/svg/SVGPointList.cpp',
-    '$WEBCORE_DIR/svg/SVGPolyElement.cpp',
-    '$WEBCORE_DIR/svg/SVGPolygonElement.cpp',
-    '$WEBCORE_DIR/svg/SVGPolylineElement.cpp',
-    '$WEBCORE_DIR/svg/SVGPreserveAspectRatio.cpp',
-    '$WEBCORE_DIR/svg/SVGRadialGradientElement.cpp',
-    '$WEBCORE_DIR/svg/SVGRectElement.cpp',
-    '$WEBCORE_DIR/svg/SVGScriptElement.cpp',
-    '$WEBCORE_DIR/svg/SVGSetElement.cpp',
-    '$WEBCORE_DIR/svg/SVGStopElement.cpp',
-    '$WEBCORE_DIR/svg/SVGStringList.cpp',
-    '$WEBCORE_DIR/svg/SVGStylable.cpp',
-    '$WEBCORE_DIR/svg/SVGStyledElement.cpp',
-    '$WEBCORE_DIR/svg/SVGStyledLocatableElement.cpp',
-    '$WEBCORE_DIR/svg/SVGStyledTransformableElement.cpp',
-    '$WEBCORE_DIR/svg/SVGStyleElement.cpp',
-    '$WEBCORE_DIR/svg/SVGSVGElement.cpp',
-    '$WEBCORE_DIR/svg/SVGSwitchElement.cpp',
-    '$WEBCORE_DIR/svg/SVGSymbolElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTests.cpp',
-    '$WEBCORE_DIR/svg/SVGTextContentElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTextElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTextPathElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTextPositioningElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTimer.cpp',
-    '$WEBCORE_DIR/svg/SVGTitleElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTransform.cpp',
-    '$WEBCORE_DIR/svg/SVGTransformable.cpp',
-    '$WEBCORE_DIR/svg/SVGTransformDistance.cpp',
-    '$WEBCORE_DIR/svg/SVGTransformList.cpp',
-    '$WEBCORE_DIR/svg/SVGTRefElement.cpp',
-    '$WEBCORE_DIR/svg/SVGTSpanElement.cpp',
-    '$WEBCORE_DIR/svg/SVGURIReference.cpp',
-    '$WEBCORE_DIR/svg/SVGUseElement.cpp',
-    '$WEBCORE_DIR/svg/SVGViewElement.cpp',
-    '$WEBCORE_DIR/svg/SVGViewSpec.cpp',
-    '$WEBCORE_DIR/svg/SVGZoomAndPan.cpp',
-    '$WEBCORE_DIR/svg/SVGZoomEvent.cpp',
-    '$WEBCORE_DIR/svg/TimeScheduler.cpp',
-    '$PENDING_DIR/SVGImage.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGPaintServer.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGPaintServerGradient.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGPaintServerLinearGradient.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGPaintServerPattern.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGPaintServerRadialGradient.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGPaintServerSolid.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGResource.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGResourceClipper.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGResourceFilter.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
-    '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEBlend.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEColorMatrix.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEComponentTransfer.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEComposite.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEConvolveMatrix.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEDiffuseLighting.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEDisplacementMap.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEFlood.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEGaussianBlur.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEImage.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEMerge.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEMorphology.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFEOffset.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFESpecularLighting.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFETurbulence.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGFilterEffect.cpp',
-    '$WEBCORE_DIR/svg/graphics/filters/SVGLightSource.cpp',
-
-    '$WEBCORE_DIR/xml/DOMParser.cpp',
-    '$WEBCORE_DIR/xml/NativeXPathNSResolver.cpp',
-    '$PENDING_DIR/XMLHttpRequest.cpp',
-    '$WEBCORE_DIR/xml/XMLSerializer.cpp',
-    '$WEBCORE_DIR/xml/XPathEvaluator.cpp',
-    '$WEBCORE_DIR/xml/XPathExpression.cpp',
-    '$WEBCORE_DIR/xml/XPathExpressionNode.cpp',
-    '$WEBCORE_DIR/xml/XPathFunctions.cpp',
-    '$WEBCORE_DIR/xml/XPathNamespace.cpp',
-    '$WEBCORE_DIR/xml/XPathNodeSet.cpp',
-    '$WEBCORE_DIR/xml/XPathNSResolver.cpp',
-    '$WEBCORE_DIR/xml/XPathParser.cpp',
-    '$WEBCORE_DIR/xml/XPathPath.cpp',
-    '$WEBCORE_DIR/xml/XPathPredicate.cpp',
-    '$WEBCORE_DIR/xml/XPathResult.cpp',
-    '$WEBCORE_DIR/xml/XPathStep.cpp',
-    '$WEBCORE_DIR/xml/XPathUtil.cpp',
-    '$WEBCORE_DIR/xml/XPathValue.cpp',
-    '$WEBCORE_DIR/xml/XPathVariableReference.cpp',
-    '$PENDING_DIR/XSLImportRule.cpp',
-    '$PENDING_DIR/XSLStyleSheet.cpp',
-    '$WEBCORE_DIR/xml/XSLTExtensions.cpp',
-    '$PENDING_DIR/XSLTProcessor.cpp',
-    '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp',
-]
-
-env.ChromeStaticLibrary('WebCore', input_files + [obj])
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Append(
+    CCFLAGS = [
+        '/TP',
+
+        '/wd4138',
+        '/wd4244',
+        '/wd4291',
+        '/wd4305',
+        '/wd4521',
+        '/wd4099',
+        '/wd4800',
+    ],
+)
+
+
+env_p = env.Clone()
+env_p.Append(CCFLAGS='/Ylwebcore')
+pch, obj = env_p.PCH('../precompiled_webkit.cc')
+env['PCH'] = pch
+env['PCHSTOP'] = 'precompiled_webkit.h'
+env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
+
+
+input_files = [
+    '$PENDING_DIR/JSSVGLazyEventListener.cpp',
+
+    '$WEBCORE_DIR/css/CSSBorderImageValue.cpp',
+    '$WEBCORE_DIR/css/CSSCharsetRule.cpp',
+    '$WEBCORE_DIR/css/CSSComputedStyleDeclaration.cpp',
+    '$WEBCORE_DIR/css/CSSCursorImageValue.cpp',
+    '$WEBCORE_DIR/css/CSSFontFace.cpp',
+    '$WEBCORE_DIR/css/CSSFontFaceRule.cpp',
+    '$WEBCORE_DIR/css/CSSFontFaceSource.cpp',
+    '$WEBCORE_DIR/css/CSSFontFaceSrcValue.cpp',
+    '$PENDING_DIR/CSSFontSelector.cpp',
+    '$WEBCORE_DIR/css/CSSHelper.cpp',
+    '$WEBCORE_DIR/css/CSSImageValue.cpp',
+    '$WEBCORE_DIR/css/CSSImportRule.cpp',
+    '$WEBCORE_DIR/css/CSSInheritedValue.cpp',
+    '$WEBCORE_DIR/css/CSSInitialValue.cpp',
+    '$WEBCORE_DIR/css/CSSMediaRule.cpp',
+    '$WEBCORE_DIR/css/CSSMutableStyleDeclaration.cpp',
+    '$WEBCORE_DIR/css/CSSPageRule.cpp',
+    '$PENDING_DIR/CSSParser.cpp',
+    '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp',
+    '$WEBCORE_DIR/css/CSSProperty.cpp',
+    '$WEBCORE_DIR/css/CSSRule.cpp',
+    '$WEBCORE_DIR/css/CSSRuleList.cpp',
+    '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp',
+    '$WEBCORE_DIR/css/CSSSelector.cpp',
+    '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp',
+    '$WEBCORE_DIR/css/CSSStyleRule.cpp',
+    '$PENDING_DIR/CSSStyleSelector.cpp',
+    '$WEBCORE_DIR/css/CSSStyleSheet.cpp',
+    '$WEBCORE_DIR/css/CSSTimingFunctionValue.cpp',
+    '$WEBCORE_DIR/css/CSSTransformValue.cpp',
+    '$WEBCORE_DIR/css/CSSUnicodeRangeValue.cpp',
+    '$WEBCORE_DIR/css/CSSValueList.cpp',
+    '$WEBCORE_DIR/css/FontFamilyValue.cpp',
+    '$WEBCORE_DIR/css/FontValue.cpp',
+    '$WEBCORE_DIR/css/MediaFeatureNames.cpp',
+    '$WEBCORE_DIR/css/MediaList.cpp',
+    '$WEBCORE_DIR/css/MediaQuery.cpp',
+    '$WEBCORE_DIR/css/MediaQueryEvaluator.cpp',
+    '$WEBCORE_DIR/css/MediaQueryExp.cpp',
+    '$WEBCORE_DIR/css/ShadowValue.cpp',
+    '$WEBCORE_DIR/css/StyleBase.cpp',
+    '$WEBCORE_DIR/css/StyleList.cpp',
+    '$WEBCORE_DIR/css/StyleSheet.cpp',
+    '$WEBCORE_DIR/css/StyleSheetList.cpp',
+    '$WEBCORE_DIR/css/SVGCSSComputedStyleDeclaration.cpp',
+    '$WEBCORE_DIR/css/SVGCSSParser.cpp',
+    '$WEBCORE_DIR/css/SVGCSSStyleSelector.cpp',
+
+    '$WEBCORE_DIR/dom/Attr.cpp',
+    '$WEBCORE_DIR/dom/Attribute.cpp',
+    '$WEBCORE_DIR/dom/BeforeTextInsertedEvent.cpp',
+    '$WEBCORE_DIR/dom/BeforeUnloadEvent.cpp',
+    '$WEBCORE_DIR/dom/CDATASection.cpp',
+    '$PENDING_DIR/CharacterData.cpp',
+    '$WEBCORE_DIR/dom/ChildNodeList.cpp',
+    '$WEBCORE_DIR/dom/ClassNames.cpp',
+    '$WEBCORE_DIR/dom/ClassNodeList.cpp',
+    '$WEBCORE_DIR/dom/Clipboard.cpp',
+    '$WEBCORE_DIR/dom/ClipboardEvent.cpp',
+    '$WEBCORE_DIR/dom/Comment.cpp',
+    '$PENDING_DIR/ContainerNode.cpp',
+    '$WEBCORE_DIR/dom/CSSMappedAttributeDeclaration.cpp',
+    '$PENDING_DIR/Document.cpp',
+    '$WEBCORE_DIR/dom/DocumentFragment.cpp',
+    '$WEBCORE_DIR/dom/DocumentType.cpp',
+    '$WEBCORE_DIR/dom/DOMImplementation.cpp',
+    '$WEBCORE_DIR/dom/DynamicNodeList.cpp',
+    '$WEBCORE_DIR/dom/EditingText.cpp',
+    '$WEBCORE_DIR/dom/Element.cpp',
+    '$WEBCORE_DIR/dom/Entity.cpp',
+    '$WEBCORE_DIR/dom/EntityReference.cpp',
+    '$WEBCORE_DIR/dom/Event.cpp',
+    '$WEBCORE_DIR/dom/EventNames.cpp',
+    '$PENDING_DIR/EventTarget.cpp',
+    '$PENDING_DIR/EventTargetNode.cpp',
+    '$WEBCORE_DIR/dom/ExceptionBase.cpp',
+    '$WEBCORE_DIR/dom/ExceptionCode.cpp',
+    '$WEBCORE_DIR/dom/KeyboardEvent.cpp',
+    '$WEBCORE_DIR/dom/MappedAttribute.cpp',
+    '$WEBCORE_DIR/dom/MessageEvent.cpp',
+    '$WEBCORE_DIR/dom/MouseEvent.cpp',
+    '$WEBCORE_DIR/dom/MouseRelatedEvent.cpp',
+    '$WEBCORE_DIR/dom/MutationEvent.cpp',
+    '$PENDING_DIR/NamedAttrMap.cpp',
+    '$WEBCORE_DIR/dom/NamedMappedAttrMap.cpp',
+    '$WEBCORE_DIR/dom/NameNodeList.cpp',
+    '$PENDING_DIR/Node.cpp',
+    '$WEBCORE_DIR/dom/NodeFilter.cpp',
+    '$WEBCORE_DIR/dom/NodeFilterCondition.cpp',
+    '$WEBCORE_DIR/dom/NodeIterator.cpp',
+    '$WEBCORE_DIR/dom/Notation.cpp',
+    '$WEBCORE_DIR/dom/OverflowEvent.cpp',
+    '$WEBCORE_DIR/dom/Position.cpp',
+    '$WEBCORE_DIR/dom/PositionIterator.cpp',
+    '$WEBCORE_DIR/dom/ProcessingInstruction.cpp',
+    '$WEBCORE_DIR/dom/ProgressEvent.cpp',
+    '$WEBCORE_DIR/dom/QualifiedName.cpp',
+    '$WEBCORE_DIR/dom/Range.cpp',
+    '$WEBCORE_DIR/dom/RegisteredEventListener.cpp',
+    '$WEBCORE_DIR/dom/SelectorNodeList.cpp',
+    '$WEBCORE_DIR/dom/StaticNodeList.cpp',
+    '$WEBCORE_DIR/dom/StyledElement.cpp',
+    '$WEBCORE_DIR/dom/StyleElement.cpp',
+    '$WEBCORE_DIR/dom/TagNodeList.cpp',
+    '$WEBCORE_DIR/dom/Text.cpp',
+    '$WEBCORE_DIR/dom/TextEvent.cpp',
+    '$WEBCORE_DIR/dom/Traversal.cpp',
+    '$WEBCORE_DIR/dom/TreeWalker.cpp',
+    '$WEBCORE_DIR/dom/UIEvent.cpp',
+    '$WEBCORE_DIR/dom/UIEventWithKeyState.cpp',
+    '$WEBCORE_DIR/dom/WheelEvent.cpp',
+    '$PENDING_DIR/XMLTokenizer.cpp',
+
+    '$WEBCORE_DIR/editing/AppendNodeCommand.cpp',
+    '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp',
+    '$WEBCORE_DIR/editing/BreakBlockquoteCommand.cpp',
+    '$WEBCORE_DIR/editing/CompositeEditCommand.cpp',
+    '$WEBCORE_DIR/editing/CreateLinkCommand.cpp',
+    '$WEBCORE_DIR/editing/DeleteButton.cpp',
+    '$WEBCORE_DIR/editing/DeleteButtonController.cpp',
+    '$WEBCORE_DIR/editing/DeleteFromTextNodeCommand.cpp',
+    '$PENDING_DIR/DeleteSelectionCommand.cpp',
+    '$WEBCORE_DIR/editing/EditCommand.cpp',
+    '$WEBCORE_DIR/editing/Editor.cpp',
+    '$WEBCORE_DIR/editing/EditorCommand.cpp',
+    '$WEBCORE_DIR/editing/FormatBlockCommand.cpp',
+    '$WEBCORE_DIR/editing/htmlediting.cpp',
+    '$WEBCORE_DIR/editing/HTMLInterchange.cpp',
+    '$PENDING_DIR/IndentOutdentCommand.cpp',
+    '$WEBCORE_DIR/editing/InsertIntoTextNodeCommand.cpp',
+    '$WEBCORE_DIR/editing/InsertLineBreakCommand.cpp',
+    '$WEBCORE_DIR/editing/InsertListCommand.cpp',
+    '$WEBCORE_DIR/editing/InsertNodeBeforeCommand.cpp',
+    '$WEBCORE_DIR/editing/InsertParagraphSeparatorCommand.cpp',
+    '$WEBCORE_DIR/editing/InsertTextCommand.cpp',
+    '$WEBCORE_DIR/editing/JoinTextNodesCommand.cpp',
+    '$PENDING_DIR/markup.cpp',
+    '$WEBCORE_DIR/editing/MergeIdenticalElementsCommand.cpp',
+    '$WEBCORE_DIR/editing/ModifySelectionListLevel.cpp',
+    '$WEBCORE_DIR/editing/MoveSelectionCommand.cpp',
+    '$WEBCORE_DIR/editing/RemoveCSSPropertyCommand.cpp',
+    '$PENDING_DIR/RemoveFormatCommand.cpp',
+    '$WEBCORE_DIR/editing/RemoveNodeAttributeCommand.cpp',
+    '$WEBCORE_DIR/editing/RemoveNodeCommand.cpp',
+    '$WEBCORE_DIR/editing/RemoveNodePreservingChildrenCommand.cpp',
+    '$PENDING_DIR/ReplaceSelectionCommand.cpp',
+    '$PENDING_DIR/Selection.cpp',
+    '$WEBCORE_DIR/editing/SelectionController.cpp',
+    '$WEBCORE_DIR/editing/SetNodeAttributeCommand.cpp',
+    '$WEBCORE_DIR/editing/SmartReplaceICU.cpp',
+    '$WEBCORE_DIR/editing/SmartReplace.cpp',
+    '$WEBCORE_DIR/editing/SplitElementCommand.cpp',
+    '$WEBCORE_DIR/editing/SplitTextNodeCommand.cpp',
+    '$WEBCORE_DIR/editing/SplitTextNodeContainingElementCommand.cpp',
+    '$WEBCORE_DIR/editing/TextIterator.cpp',
+    '$WEBCORE_DIR/editing/TypingCommand.cpp',
+    '$WEBCORE_DIR/editing/UnlinkCommand.cpp',
+    '$WEBCORE_DIR/editing/visible_units.cpp',
+    '$WEBCORE_DIR/editing/VisiblePosition.cpp',
+    '$WEBCORE_DIR/editing/WrapContentsInDummySpanCommand.cpp',
+
+    '$WEBCORE_DIR/history/PageCache.cpp',
+    '$WEBCORE_DIR/history/HistoryItem.cpp',
+
+    '$PENDING_DIR/CanvasGradient.cpp',
+    '$PENDING_DIR/CanvasPattern.cpp',
+    '$PENDING_DIR/CanvasRenderingContext2D.cpp',
+    '$PENDING_DIR/CanvasStyle.cpp',
+    '$WEBCORE_DIR/html/FormDataList.cpp',
+    '$PENDING_DIR/HTMLAnchorElement.cpp',
+    '$PENDING_DIR/HTMLAppletElement.cpp',
+    '$PENDING_DIR/HTMLAreaElement.cpp',
+    '$WEBCORE_DIR/html/HTMLAudioElement.cpp',
+    '$WEBCORE_DIR/html/HTMLBaseElement.cpp',
+    '$WEBCORE_DIR/html/HTMLBaseFontElement.cpp',
+    '$WEBCORE_DIR/html/HTMLBlockquoteElement.cpp',
+    '$WEBCORE_DIR/html/HTMLBodyElement.cpp',
+    '$WEBCORE_DIR/html/HTMLBRElement.cpp',
+    '$WEBCORE_DIR/html/HTMLButtonElement.cpp',
+    '$PENDING_DIR/HTMLCanvasElement.cpp',
+    '$WEBCORE_DIR/html/HTMLCollection.cpp',
+    '$WEBCORE_DIR/html/HTMLDirectoryElement.cpp',
+    '$WEBCORE_DIR/html/HTMLDivElement.cpp',
+    '$WEBCORE_DIR/html/HTMLDListElement.cpp',
+    '$WEBCORE_DIR/html/HTMLDocument.cpp',
+    '$PENDING_DIR/HTMLElement.cpp',
+    '$WEBCORE_DIR/html/HTMLElementFactory.cpp',
+    '$PENDING_DIR/HTMLEmbedElement.cpp',
+    '$PENDING_DIR/HTMLFieldSetElement.cpp',
+    '$WEBCORE_DIR/html/HTMLFontElement.cpp',
+    '$WEBCORE_DIR/html/HTMLFormCollection.cpp',
+    '$WEBCORE_DIR/html/HTMLFormElement.cpp',
+    '$WEBCORE_DIR/html/HTMLFrameElement.cpp',
+    '$WEBCORE_DIR/html/HTMLFrameElementBase.cpp',
+    '$WEBCORE_DIR/html/HTMLFrameOwnerElement.cpp',
+    '$WEBCORE_DIR/html/HTMLFrameSetElement.cpp',
+    '$PENDING_DIR/HTMLGenericFormElement.cpp',
+    '$WEBCORE_DIR/html/HTMLHeadElement.cpp',
+    '$WEBCORE_DIR/html/HTMLHeadingElement.cpp',
+    '$WEBCORE_DIR/html/HTMLHRElement.cpp',
+    '$WEBCORE_DIR/html/HTMLHtmlElement.cpp',
+    '$WEBCORE_DIR/html/HTMLIFrameElement.cpp',
+    '$WEBCORE_DIR/html/HTMLImageElement.cpp',
+    '$WEBCORE_DIR/html/HTMLImageLoader.cpp',
+    '$PENDING_DIR/HTMLInputElement.cpp',
+    '$WEBCORE_DIR/html/HTMLIsIndexElement.cpp',
+    '$WEBCORE_DIR/html/HTMLKeygenElement.cpp',
+    '$WEBCORE_DIR/html/HTMLLabelElement.cpp',
+    '$PENDING_DIR/HTMLLegendElement.cpp',
+    '$WEBCORE_DIR/html/HTMLLIElement.cpp',
+    '$PENDING_DIR/HTMLLinkElement.cpp',
+    '$WEBCORE_DIR/html/HTMLMapElement.cpp',
+    '$WEBCORE_DIR/html/HTMLMarqueeElement.cpp',
+    '$WEBCORE_DIR/html/HTMLMediaElement.cpp',
+    '$WEBCORE_DIR/html/HTMLMenuElement.cpp',
+    '$WEBCORE_DIR/html/HTMLMetaElement.cpp',
+    '$WEBCORE_DIR/html/HTMLModElement.cpp',
+    '$WEBCORE_DIR/html/HTMLNameCollection.cpp',
+    '$PENDING_DIR/HTMLObjectElement.cpp',
+    '$WEBCORE_DIR/html/HTMLOListElement.cpp',
+    '$PENDING_DIR/HTMLOptGroupElement.cpp',
+    '$PENDING_DIR/HTMLOptionElement.cpp',
+    '$WEBCORE_DIR/html/HTMLOptionsCollection.cpp',
+    '$WEBCORE_DIR/html/HTMLParagraphElement.cpp',
+    '$WEBCORE_DIR/html/HTMLParamElement.cpp',
+    '$PENDING_DIR/HTMLParser.cpp',
+    '$WEBCORE_DIR/html/HTMLParserErrorCodes.cpp',
+    '$PENDING_DIR/HTMLPlugInElement.cpp',
+    '$WEBCORE_DIR/html/HTMLPreElement.cpp',
+    '$WEBCORE_DIR/html/HTMLQuoteElement.cpp',
+    '$PENDING_DIR/HTMLScriptElement.cpp',
+    '$WEBCORE_DIR/html/HTMLSelectElement.cpp',
+    '$WEBCORE_DIR/html/HTMLStyleElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTableCaptionElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTableCellElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTableColElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTableElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTablePartElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTableRowElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTableRowsCollection.cpp',
+    '$WEBCORE_DIR/html/HTMLTableSectionElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTextAreaElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTextFieldInnerElement.cpp',
+    '$WEBCORE_DIR/html/HTMLTitleElement.cpp',
+    '$PENDING_DIR/HTMLTokenizer.cpp',
+    '$WEBCORE_DIR/html/HTMLUListElement.cpp',
+    '$WEBCORE_DIR/html/HTMLVideoElement.cpp',
+    '$WEBCORE_DIR/html/HTMLViewSourceDocument.cpp',
+
+    '$WEBCORE_DIR/loader/Cache.cpp',
+    '$WEBCORE_DIR/loader/CachedCSSStyleSheet.cpp',
+    '$WEBCORE_DIR/loader/CachedFont.cpp',
+    '$WEBCORE_DIR/loader/CachedImage.cpp',
+    '$WEBCORE_DIR/loader/CachedResource.cpp',
+    '$WEBCORE_DIR/loader/CachedResourceClientWalker.cpp',
+    '$WEBCORE_DIR/loader/CachedScript.cpp',
+    '$WEBCORE_DIR/loader/CachedXBLDocument.cpp',
+    '$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
+    '$PENDING_DIR/DocLoader.cpp',
+    '$WEBCORE_DIR/loader/DocumentLoader.cpp',
+    '$WEBCORE_DIR/loader/FormState.cpp',
+    '$PENDING_DIR/FrameLoader.cpp',
+    '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp',
+    '$WEBCORE_DIR/loader/ImageDocument.cpp',
+    '$WEBCORE_DIR/loader/loader.cpp',
+    '$WEBCORE_DIR/loader/MainResourceLoader.cpp',
+    '$WEBCORE_DIR/loader/NavigationAction.cpp',
+    '$WEBCORE_DIR/loader/NetscapePlugInStreamLoader.cpp',
+    '$WEBCORE_DIR/loader/PluginDocument.cpp',
+    '$WEBCORE_DIR/loader/ProgressTracker.cpp',
+    '$WEBCORE_DIR/loader/Request.cpp',
+    '$WEBCORE_DIR/loader/ResourceLoader.cpp',
+    '$WEBCORE_DIR/loader/SubresourceLoader.cpp',
+    '$WEBCORE_DIR/loader/TextDocument.cpp',
+    '$PENDING_DIR/TextResourceDecoder.cpp',
+
+    '$WEBCORE_DIR/page/AnimationController.cpp',
+    '$WEBCORE_DIR/page/BarInfo.cpp',
+    '$PENDING_DIR/AXObjectCache.cpp',
+    '$WEBCORE_DIR/page/AnimationController.cpp',
+    '$PENDING_DIR/AccessibilityObject.cpp',
+    '$WEBCORE_DIR/page/BarInfo.cpp',
+    '$PENDING_DIR/Chrome.cpp',
+    '$WEBCORE_DIR/page/Console.cpp',
+    '$WEBCORE_DIR/page/ContextMenuController.cpp',
+    '$WEBCORE_DIR/page/DOMSelection.cpp',
+    '$PENDING_DIR/DOMWindow.cpp',
+    '$PENDING_DIR/DragController.cpp',
+    '$PENDING_DIR/EventHandler.cpp',
+    '$WEBCORE_DIR/page/FocusController.cpp',
+    '$PENDING_DIR/Frame.cpp',
+    '$WEBCORE_DIR/page/FrameTree.cpp',
+    '$PENDING_DIR/FrameView.cpp',
+    '$WEBCORE_DIR/page/History.cpp',
+    '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp',
+    '$PENDING_DIR/Page.cpp',
+    '$WEBCORE_DIR/page/Screen.cpp',
+    '$PENDING_DIR/Settings.cpp',
+    '$WEBCORE_DIR/page/WindowFeatures.cpp',
+
+    '$WEBCORE_DIR/platform/Arena.cpp',
+    '$WEBCORE_DIR/platform/ArrayImpl.cpp',
+    '$WEBCORE_DIR/platform/ContextMenu.cpp',
+    '$WEBCORE_DIR/platform/DeprecatedCString.cpp',
+    '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp',
+    '$PENDING_DIR/DeprecatedString.cpp',
+    '$WEBCORE_DIR/platform/DeprecatedStringList.cpp',
+    '$WEBCORE_DIR/platform/DeprecatedValueListImpl.cpp',
+    '$WEBCORE_DIR/platform/DragData.cpp',
+    '$WEBCORE_DIR/platform/DragImage.cpp',
+    '$WEBCORE_DIR/platform/FileChooser.cpp',
+    '$PENDING_DIR/Font.cpp',
+    '$PENDING_DIR/FontCache.cpp',
+    '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp',
+    '$WEBCORE_DIR/platform/graphics/FontFamily.cpp',
+    '$WEBCORE_DIR/platform/graphics/GlyphPageTreeNode.cpp',
+    '$PENDING_DIR/GlyphWidthMap.cpp',
+    '$PENDING_DIR/KURL.cpp',
+    '$WEBCORE_DIR/platform/Logging.cpp',
+    '$PORT_DIR/platform/MIMETypeRegistry.cpp',
+    '$WEBCORE_DIR/platform/ScrollBar.cpp',
+    '$PENDING_DIR/SecurityOrigin.cpp',
+    '$WEBCORE_DIR/platform/SharedBuffer.cpp',
+    '$WEBCORE_DIR/platform/Timer.cpp',
+    '$WEBCORE_DIR/platform/Widget.cpp',
+    '$WEBCORE_DIR/platform/graphics/AffineTransform.cpp',
+    '$PENDING_DIR/BitmapImage.cpp',
+    '$WEBCORE_DIR/platform/graphics/Color.cpp',
+    '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp',
+    '$WEBCORE_DIR/platform/graphics/FloatPoint3D.cpp',
+    '$WEBCORE_DIR/platform/graphics/FloatRect.cpp',
+    '$WEBCORE_DIR/platform/graphics/FloatSize.cpp',
+    '$WEBCORE_DIR/platform/graphics/FontData.cpp',
+    '$WEBCORE_DIR/platform/graphics/GraphicsContext.cpp',
+    '$WEBCORE_DIR/platform/graphics/GraphicsTypes.cpp',
+    '$WEBCORE_DIR/platform/graphics/Image.cpp',
+    '$WEBCORE_DIR/platform/graphics/IntRect.cpp',
+    '$WEBCORE_DIR/platform/graphics/Path.cpp',
+    '$WEBCORE_DIR/platform/graphics/PathTraversalState.cpp',
+    '$WEBCORE_DIR/platform/graphics/Pen.cpp',
+    '$WEBCORE_DIR/platform/graphics/SegmentedFontData.cpp',
+    '$PENDING_DIR/SimpleFontData.cpp',
+    '$WEBCORE_DIR/platform/network/AuthenticationChallenge.cpp',
+    '$WEBCORE_DIR/platform/network/Credential.cpp',
+    '$WEBCORE_DIR/platform/network/FormData.cpp',
+    '$WEBCORE_DIR/platform/network/HTTPParsers.cpp',
+    '$WEBCORE_DIR/platform/network/ProtectionSpace.cpp',
+    '$WEBCORE_DIR/platform/network/ResourceError.cpp',
+    '$WEBCORE_DIR/platform/network/ResourceRequestBase.cpp',
+    '$WEBCORE_DIR/platform/network/ResourceResponseBase.cpp',
+    '$PENDING_DIR/FileSystemWin.cpp',
+    '$PENDING_DIR/AtomicString.cpp',
+    '$WEBCORE_DIR/platform/text/Base64.cpp',
+    '$WEBCORE_DIR/platform/text/BidiContext.cpp',
+    '$WEBCORE_DIR/platform/text/CString.cpp',
+    '$WEBCORE_DIR/platform/text/RegularExpression.cpp',
+    '$WEBCORE_DIR/platform/text/SegmentedString.cpp',
+    '$PENDING_DIR/String.cpp',
+    '$PENDING_DIR/StringImpl.cpp',
+    '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp',
+    '$WEBCORE_DIR/platform/text/TextBoundariesICU.cpp',
+    '$WEBCORE_DIR/platform/text/TextBreakIteratorICU.cpp',
+    '$PENDING_DIR/TextCodec.cpp',
+    '$PENDING_DIR/TextCodecICU.cpp',
+    '$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp',
+    '$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp',
+    '$PENDING_DIR/TextCodecUTF16.cpp',
+    '$PENDING_DIR/TextDecoder.cpp',
+    '$WEBCORE_DIR/platform/text/TextEncoding.cpp',
+    '$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp',
+    '$WEBCORE_DIR/platform/text/TextStream.cpp',
+    '$WEBCORE_DIR/platform/text/UnicodeRange.cpp',
+
+    '$WEBCORE_DIR/rendering/AutoTableLayout.cpp',
+    '$PENDING_DIR/bidi.cpp',
+    '$WEBCORE_DIR/rendering/break_lines.cpp',
+    '$WEBCORE_DIR/rendering/CounterNode.cpp',
+    '$WEBCORE_DIR/rendering/EllipsisBox.cpp',
+    '$WEBCORE_DIR/rendering/FixedTableLayout.cpp',
+    '$WEBCORE_DIR/rendering/HitTestResult.cpp',
+    '$WEBCORE_DIR/rendering/InlineBox.cpp',
+    '$WEBCORE_DIR/rendering/InlineFlowBox.cpp',
+    '$WEBCORE_DIR/rendering/InlineTextBox.cpp',
+    '$WEBCORE_DIR/rendering/LayoutState.cpp',
+    '$WEBCORE_DIR/rendering/ListMarkerBox.cpp',
+    '$WEBCORE_DIR/rendering/MediaControlElements.cpp',
+    '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp',
+    '$WEBCORE_DIR/rendering/RenderApplet.cpp',
+    '$WEBCORE_DIR/rendering/RenderArena.cpp',
+    '$PENDING_DIR/RenderBlock.cpp',
+    '$WEBCORE_DIR/rendering/RenderBox.cpp',
+    '$WEBCORE_DIR/rendering/RenderBR.cpp',
+    '$PENDING_DIR/RenderButton.cpp',
+    '$WEBCORE_DIR/rendering/RenderContainer.cpp',
+    '$WEBCORE_DIR/rendering/RenderCounter.cpp',
+    '$WEBCORE_DIR/rendering/RenderFieldset.cpp',
+    '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp',
+    '$WEBCORE_DIR/rendering/RenderFlexibleBox.cpp',
+    '$WEBCORE_DIR/rendering/RenderFlow.cpp',
+    '$WEBCORE_DIR/rendering/RenderForeignObject.cpp',
+    '$WEBCORE_DIR/rendering/RenderFrame.cpp',
+    '$WEBCORE_DIR/rendering/RenderFrameSet.cpp',
+    '$WEBCORE_DIR/rendering/RenderHTMLCanvas.cpp',
+    '$WEBCORE_DIR/rendering/RenderImage.cpp',
+    '$WEBCORE_DIR/rendering/RenderInline.cpp',
+    '$WEBCORE_DIR/rendering/RenderLayer.cpp',
+    '$WEBCORE_DIR/rendering/RenderLegend.cpp',
+    '$WEBCORE_DIR/rendering/RenderListBox.cpp',
+    '$WEBCORE_DIR/rendering/RenderListItem.cpp',
+    '$WEBCORE_DIR/rendering/RenderListMarker.cpp',
+    '$PENDING_DIR/RenderMenuList.cpp',
+    '$PENDING_DIR/RenderObject.cpp',
+    '$WEBCORE_DIR/rendering/RenderPart.cpp',
+    '$PENDING_DIR/RenderPartObject.cpp',
+    '$WEBCORE_DIR/rendering/RenderPath.cpp',
+    '$WEBCORE_DIR/rendering/RenderReplaced.cpp',
+    '$WEBCORE_DIR/rendering/RenderSlider.cpp',
+    '$WEBCORE_DIR/rendering/RenderStyle.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGBlock.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGContainer.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGGradientStop.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGHiddenContainer.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGImage.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGInline.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGInlineText.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGRoot.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGText.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGTextPath.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGTransformableContainer.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGTSpan.cpp',
+    '$WEBCORE_DIR/rendering/RenderSVGViewportContainer.cpp',
+    '$PENDING_DIR/RenderTable.cpp',
+    '$WEBCORE_DIR/rendering/RenderTableCell.cpp',
+    '$WEBCORE_DIR/rendering/RenderTableCol.cpp',
+    '$WEBCORE_DIR/rendering/RenderTableRow.cpp',
+    '$WEBCORE_DIR/rendering/RenderTableSection.cpp',
+    '$PENDING_DIR/RenderText.cpp',
+    '$PENDING_DIR/RenderTextControl.cpp',
+    '$WEBCORE_DIR/rendering/RenderTextFragment.cpp',
+    '$WEBCORE_DIR/rendering/RenderTheme.cpp',
+    '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp',
+    '$WEBCORE_DIR/rendering/RenderVideo.cpp',
+    '$WEBCORE_DIR/rendering/RenderView.cpp',
+    '$WEBCORE_DIR/rendering/RenderWidget.cpp',
+    '$PENDING_DIR/RenderWordBreak.cpp',
+    '$WEBCORE_DIR/rendering/RootInlineBox.cpp',
+    '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp',
+    '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp',
+    '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp',
+    '$WEBCORE_DIR/rendering/SVGRenderStyle.cpp',
+    '$WEBCORE_DIR/rendering/SVGRenderStyleDefs.cpp',
+    '$WEBCORE_DIR/rendering/SVGRenderSupport.cpp',
+    '$WEBCORE_DIR/rendering/SVGRenderTreeAsText.cpp',
+    '$PENDING_DIR/SVGRootInlineBox.cpp',
+
+    '$WEBCORE_DIR/svg/ColorDistance.cpp',
+    '$WEBCORE_DIR/svg/SVGAElement.cpp',
+    '$WEBCORE_DIR/svg/SVGAngle.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimateColorElement.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimatedPathData.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimatedPoints.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimateElement.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimateMotionElement.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimateTransformElement.cpp',
+    '$WEBCORE_DIR/svg/SVGAnimationElement.cpp',
+    '$WEBCORE_DIR/svg/SVGCircleElement.cpp',
+    '$WEBCORE_DIR/svg/SVGClipPathElement.cpp',
+    '$WEBCORE_DIR/svg/SVGColor.cpp',
+    '$WEBCORE_DIR/svg/SVGComponentTransferFunctionElement.cpp',
+    '$WEBCORE_DIR/svg/SVGCursorElement.cpp',
+    '$WEBCORE_DIR/svg/SVGDefinitionSrcElement.cpp',
+    '$WEBCORE_DIR/svg/SVGDefsElement.cpp',
+    '$WEBCORE_DIR/svg/SVGDescElement.cpp',
+    '$WEBCORE_DIR/svg/SVGDocument.cpp',
+    '$PENDING_DIR/SVGDocumentExtensions.cpp',
+    '$WEBCORE_DIR/svg/SVGElement.cpp',
+    '$WEBCORE_DIR/svg/SVGElementInstance.cpp',
+    '$WEBCORE_DIR/svg/SVGElementInstanceList.cpp',
+    '$WEBCORE_DIR/svg/SVGEllipseElement.cpp',
+    '$WEBCORE_DIR/svg/SVGExternalResourcesRequired.cpp',
+    '$WEBCORE_DIR/svg/SVGFEBlendElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEColorMatrixElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEComponentTransferElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFECompositeElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEDiffuseLightingElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEDisplacementMapElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEDistantLightElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEFloodElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEFuncAElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEFuncBElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEFuncGElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEFuncRElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEGaussianBlurElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEImageElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFELightElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEMergeElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEMergeNodeElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEOffsetElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFEPointLightElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFESpecularLightingElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFESpotLightElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFETileElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFETurbulenceElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFilterElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFilterPrimitiveStandardAttributes.cpp',
+    '$WEBCORE_DIR/svg/SVGFitToViewBox.cpp',
+    '$WEBCORE_DIR/svg/SVGFont.cpp',
+    '$WEBCORE_DIR/svg/SVGFontData.cpp',
+    '$WEBCORE_DIR/svg/SVGFontElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFontFaceElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFontFaceFormatElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFontFaceNameElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFontFaceSrcElement.cpp',
+    '$WEBCORE_DIR/svg/SVGFontFaceUriElement.cpp',
+    '$WEBCORE_DIR/svg/SVGForeignObjectElement.cpp',
+    '$WEBCORE_DIR/svg/SVGGElement.cpp',
+    '$WEBCORE_DIR/svg/SVGGlyphElement.cpp',
+    '$WEBCORE_DIR/svg/SVGGradientElement.cpp',
+    '$WEBCORE_DIR/svg/SVGImageElement.cpp',
+    '$WEBCORE_DIR/svg/SVGImageLoader.cpp',
+    '$WEBCORE_DIR/svg/SVGLangSpace.cpp',
+    '$WEBCORE_DIR/svg/SVGLength.cpp',
+    '$WEBCORE_DIR/svg/SVGLengthList.cpp',
+    '$WEBCORE_DIR/svg/SVGLinearGradientElement.cpp',
+    '$WEBCORE_DIR/svg/SVGLineElement.cpp',
+    '$WEBCORE_DIR/svg/SVGLocatable.cpp',
+    '$WEBCORE_DIR/svg/SVGMarkerElement.cpp',
+    '$WEBCORE_DIR/svg/SVGMaskElement.cpp',
+    '$WEBCORE_DIR/svg/SVGMetadataElement.cpp',
+    '$WEBCORE_DIR/svg/SVGMissingGlyphElement.cpp',
+    '$WEBCORE_DIR/svg/SVGMPathElement.cpp',
+    '$WEBCORE_DIR/svg/SVGNumberList.cpp',
+    '$WEBCORE_DIR/svg/SVGPaint.cpp',
+    '$WEBCORE_DIR/svg/SVGParserUtilities.cpp',
+    '$WEBCORE_DIR/svg/SVGPathElement.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegArc.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegClosePath.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegCurvetoCubic.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegCurvetoCubicSmooth.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegCurvetoQuadratic.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegCurvetoQuadraticSmooth.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegLineto.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegLinetoHorizontal.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegLinetoVertical.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegList.cpp',
+    '$WEBCORE_DIR/svg/SVGPathSegMoveto.cpp',
+    '$WEBCORE_DIR/svg/SVGPatternElement.cpp',
+    '$WEBCORE_DIR/svg/SVGPointList.cpp',
+    '$WEBCORE_DIR/svg/SVGPolyElement.cpp',
+    '$WEBCORE_DIR/svg/SVGPolygonElement.cpp',
+    '$WEBCORE_DIR/svg/SVGPolylineElement.cpp',
+    '$WEBCORE_DIR/svg/SVGPreserveAspectRatio.cpp',
+    '$WEBCORE_DIR/svg/SVGRadialGradientElement.cpp',
+    '$WEBCORE_DIR/svg/SVGRectElement.cpp',
+    '$WEBCORE_DIR/svg/SVGScriptElement.cpp',
+    '$WEBCORE_DIR/svg/SVGSetElement.cpp',
+    '$WEBCORE_DIR/svg/SVGStopElement.cpp',
+    '$WEBCORE_DIR/svg/SVGStringList.cpp',
+    '$WEBCORE_DIR/svg/SVGStylable.cpp',
+    '$WEBCORE_DIR/svg/SVGStyledElement.cpp',
+    '$WEBCORE_DIR/svg/SVGStyledLocatableElement.cpp',
+    '$WEBCORE_DIR/svg/SVGStyledTransformableElement.cpp',
+    '$WEBCORE_DIR/svg/SVGStyleElement.cpp',
+    '$WEBCORE_DIR/svg/SVGSVGElement.cpp',
+    '$WEBCORE_DIR/svg/SVGSwitchElement.cpp',
+    '$WEBCORE_DIR/svg/SVGSymbolElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTests.cpp',
+    '$WEBCORE_DIR/svg/SVGTextContentElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTextElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTextPathElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTextPositioningElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTimer.cpp',
+    '$WEBCORE_DIR/svg/SVGTitleElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTransform.cpp',
+    '$WEBCORE_DIR/svg/SVGTransformable.cpp',
+    '$WEBCORE_DIR/svg/SVGTransformDistance.cpp',
+    '$WEBCORE_DIR/svg/SVGTransformList.cpp',
+    '$WEBCORE_DIR/svg/SVGTRefElement.cpp',
+    '$WEBCORE_DIR/svg/SVGTSpanElement.cpp',
+    '$WEBCORE_DIR/svg/SVGURIReference.cpp',
+    '$WEBCORE_DIR/svg/SVGUseElement.cpp',
+    '$WEBCORE_DIR/svg/SVGViewElement.cpp',
+    '$WEBCORE_DIR/svg/SVGViewSpec.cpp',
+    '$WEBCORE_DIR/svg/SVGZoomAndPan.cpp',
+    '$WEBCORE_DIR/svg/SVGZoomEvent.cpp',
+    '$WEBCORE_DIR/svg/TimeScheduler.cpp',
+    '$PENDING_DIR/SVGImage.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGPaintServer.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGPaintServerGradient.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGPaintServerLinearGradient.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGPaintServerPattern.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGPaintServerRadialGradient.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGPaintServerSolid.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGResource.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGResourceClipper.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGResourceFilter.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
+    '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEBlend.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEColorMatrix.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEComponentTransfer.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEComposite.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEConvolveMatrix.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEDiffuseLighting.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEDisplacementMap.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEFlood.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEGaussianBlur.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEImage.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEMerge.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEMorphology.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFEOffset.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFESpecularLighting.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFETurbulence.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGFilterEffect.cpp',
+    '$WEBCORE_DIR/svg/graphics/filters/SVGLightSource.cpp',
+
+    '$WEBCORE_DIR/xml/DOMParser.cpp',
+    '$WEBCORE_DIR/xml/NativeXPathNSResolver.cpp',
+    '$PENDING_DIR/XMLHttpRequest.cpp',
+    '$WEBCORE_DIR/xml/XMLSerializer.cpp',
+    '$WEBCORE_DIR/xml/XPathEvaluator.cpp',
+    '$WEBCORE_DIR/xml/XPathExpression.cpp',
+    '$WEBCORE_DIR/xml/XPathExpressionNode.cpp',
+    '$WEBCORE_DIR/xml/XPathFunctions.cpp',
+    '$WEBCORE_DIR/xml/XPathNamespace.cpp',
+    '$WEBCORE_DIR/xml/XPathNodeSet.cpp',
+    '$WEBCORE_DIR/xml/XPathNSResolver.cpp',
+    '$WEBCORE_DIR/xml/XPathParser.cpp',
+    '$WEBCORE_DIR/xml/XPathPath.cpp',
+    '$WEBCORE_DIR/xml/XPathPredicate.cpp',
+    '$WEBCORE_DIR/xml/XPathResult.cpp',
+    '$WEBCORE_DIR/xml/XPathStep.cpp',
+    '$WEBCORE_DIR/xml/XPathUtil.cpp',
+    '$WEBCORE_DIR/xml/XPathValue.cpp',
+    '$WEBCORE_DIR/xml/XPathVariableReference.cpp',
+    '$PENDING_DIR/XSLImportRule.cpp',
+    '$PENDING_DIR/XSLStyleSheet.cpp',
+    '$WEBCORE_DIR/xml/XSLTExtensions.cpp',
+    '$PENDING_DIR/XSLTProcessor.cpp',
+    '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp',
+]
+
+env.ChromeStaticLibrary('WebCore', input_files + [obj])
diff --git a/webkit/build/localized_strings/SConscript b/webkit/build/localized_strings/SConscript
index d5f9e90..c2061df 100644
--- a/webkit/build/localized_strings/SConscript
+++ b/webkit/build/localized_strings/SConscript
@@ -1,58 +1,58 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import(['env', 'env_res'])
-
-env = env.Clone()
-env_res = env_res.Clone()
-
-env_res.Append(
-  CPPPATH = [
-    ".",
-    #"#/../chrome/Debug/obj/chrome_dll",
-    "#/..",
-    #"#/../chrome/Debug/obj",
-  ],
-  RCFLAGS = [
-    ["/l", "0x409"],
-  ],
-)
-
-import os
-import sys
-sys.path.append(Dir('#/../tools/grit').abspath)
-env_grd = env.Clone()
-env_grd.Tool('scons', toolpath=['#/../tools/grit/grit'])
-# This dummy target (webkit_strings) is used to tell the emitter where
-# to put the target files.
-generated = env_grd.GRIT('webkit_strings',
-                         '#/../webkit/glue/webkit_strings.grd')
-for g in [ g for g in generated if str(g).endswith('.rc') ]:
-    env_res.RES(g)
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import(['env', 'env_res'])
+
+env = env.Clone()
+env_res = env_res.Clone()
+
+env_res.Append(
+  CPPPATH = [
+    ".",
+    #"#/../chrome/Debug/obj/chrome_dll",
+    "#/..",
+    #"#/../chrome/Debug/obj",
+  ],
+  RCFLAGS = [
+    ["/l", "0x409"],
+  ],
+)
+
+import os
+import sys
+sys.path.append(Dir('#/../tools/grit').abspath)
+env_grd = env.Clone()
+env_grd.Tool('scons', toolpath=['#/../tools/grit/grit'])
+# This dummy target (webkit_strings) is used to tell the emitter where
+# to put the target files.
+generated = env_grd.GRIT('webkit_strings',
+                         '#/../webkit/glue/webkit_strings.grd')
+for g in [ g for g in generated if str(g).endswith('.rc') ]:
+    env_res.RES(g)
+
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index c74ae9c..6c1f499 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -1,661 +1,661 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import os.path
-import re
-
-Import('env')
-
-webcore = env.Dir('$WEBKIT_DIR/WebCore')
-webcore_posix = webcore.abspath.replace('\\', '/')
-
-cygwin = env.Dir('$CYGWIN_DIR/bin')
-cygwin_posix = cygwin.abspath.replace('\\', '/')
-
-pending = env.Dir('#../webkit/pending')
-portroot = env.Dir('#../webkit/port')
-webkit_build = env.Dir('#../webkit/build')
-bindings_output_dir = env.Dir('#/../webkit/$BUILD_TYPE/scons/V8Bindings')
-
-
-env = env.Clone(
-    WEBCORE = webcore,
-    PORTROOT = portroot,
-    WEBKIT_BUILD = webkit_build,
-
-    BINDINGS_SCRIPTS_DIR = '$WEBKIT_DIR/port/bindings/scripts',
-    BINDINGS_SCRIPT = '$BINDINGS_SCRIPTS_DIR/generate-bindings.pl',
-
-    PERL_INCLUDE_PATH = ['$BINDINGS_SCRIPTS_DIR',
-                         '#/../third_party/WebKit/WebCore/bindings/scripts'],
-
-    WEBKIT_PORT_DIR = '$WEBKIT_DIR/port',
-
-    FEATURE_DEFINES = [
-        'ENABLE_CROSS_DOCUMENT_MESSAGING',
-        'ENABLE_XSLT',
-        'ENABLE_XPATH',
-        'ENABLE_SVG',
-        'ENABLE_SVG_FOREIGN_OBJECT',
-        'ENABLE_SVG_USE',
-        'ENABLE_SVG_AS_IMAGE',
-        'ENABLE_SVG_FONTS',
-    ],
-
-    SVG_FLAGS = [
-        'ENABLE_SVG_FOREIGN_OBJECT=1',
-        'ENABLE_SVG_USE=1',
-        'ENABLE_SVG_AS_IMAGE=1',
-        'ENABLE_SVG_FONTS=1',
-    ],
-
-    BINDINGS_INCLUDE_PATH = [
-        '$WEBCORE/dom',
-        '$WEBCORE/html',
-        '$WEBCORE/css',
-        '$WEBCORE/page',
-        '$WEBCORE/xml',
-        '$WEBCORE/svg',
-    ],
-    BINDINGS_INCLUDE_FLAG = '--include ',
-    BINDINGS_INCLUDE_SUFFIX = '',
-    _BINDINGS_INCLUDE_FLAGS = '${_concat(BINDINGS_INCLUDE_FLAG, ' + \
-                                        'BINDINGS_INCLUDE_PATH, ' + \
-                                        'BINDINGS_INCLUDE_SUFFIX, ' + \
-                                        '__env__, RDirs, TARGET, SOURCE)}',
-)
-
-env.PrependENVPath('PATH', cygwin_posix)
-
-bindings_perl_modules = env.Glob('$BINDINGS_SCRIPTS_DIR/*.pm')
-
-
-def BindingsEmitter(target, source, env):
-  source.append('$BINDINGS_SCRIPT')
-  try:
-    idl_contents = open(source[0].rfile().abspath, 'r').read()
-  except EnvironmentError:
-    return target, source
-  idl_contents = re.sub('//[^\\n]*\\n', '', idl_contents)
-  interfaces = re.findall('interface\\s*(?:\\[[^]]+\\])?\\s*'
-                          '(\\w+)[^{]*[{]', idl_contents)
-  new_target = []
-  for i in interfaces:
-    new_cpp = '$DERIVED_DIR/${BINDINGSPREFIX}' + i + '.cpp'
-    new_h = '$DERIVED_DIR/${BINDINGSPREFIX}' + i + '.h'
-    new_target.extend([new_cpp, new_h])
-    env.Depends(new_cpp, bindings_perl_modules)
-    env.Depends(new_h, bindings_perl_modules)
-  return new_target, source
-
-
-env.Append(
-    BUILDERS = {'Bindings' : Builder(action = '$BINDINGSCOM',
-                                     src_suffix = '.idl',
-                                     emitter = BindingsEmitter,
-                                    ),
-               },
-)
-env.Replace(
-    # TODO(bradnelson): don't have the path change here!!!
-    # TODO(bradnelson): fix ugly hack with one include!
-    BINDINGSCOM = '$PERL $_PERL_INCLUDE_FLAGS ' + \
-                  '${SOURCES[1]} ' + \
-                  '--include ../webkit/port/dom ' + \
-                  '--include ../third_party/WebKit/WebCore/svg ' + \
-                  '--defines "$FEATURE_DEFINES $BINDINGS_LANGUAGE" ' + \
-                  '--generator $BINDINGS_GENERATOR_ARG ' + \
-                  '$_BINDINGS_INCLUDE_FLAGS ' + \
-                  '--outputdir ${TARGET.dir} ' + \
-                  '${SOURCES[0].posix}',
-)
-
-if env['PLATFORM'] == 'mac':  # Mac OS X
-  env['BINDINGSPREFIX'] = 'DOM'
-  env['BINDINGS_GENERATOR_ARG'] = 'ObjC'
-  env['BINDINGS_LANGUAGE'] = 'LANGUAGE_OBJECTIVE_C'
-  env.Append(BINDINGS_INCLUDE_PATH = [ 'bindings/js' ])
-elif False:
-  env['BINDINGSPREFIX'] = 'JS'
-  env['BINDINGS_GENERATOR_ARG'] = 'JS'
-  env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT'
-  env.Append(BINDINGS_INCLUDE_PATH = [ 'bindings/js' ])
-elif True:
-  env['BINDINGSPREFIX'] = 'V8'
-  env['BINDINGS_GENERATOR_ARG'] = 'V8'
-  env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT V8_BINDING'
-  env.Prepend(PERL_INCLUDE_PATH = [ '$PORTROOT/bindings/scripts' ])
-  env.Prepend(BINDINGS_INCLUDE_PATH = [
-                '$PORTROOT/dom',
-                '$PORTROOT/html',
-                '$PORTROOT/page',
-                '$PORTROOT/xml',
-              ])
-else:
-  print 'I am not going to generate bindings for you!'
-
-
-idl_files = [
-    'css/Counter.idl',
-    'css/CSSCharsetRule.idl',
-    'css/CSSFontFaceRule.idl',
-    'css/CSSImportRule.idl',
-    'css/CSSMediaRule.idl',
-    'css/CSSPageRule.idl',
-    'css/CSSPrimitiveValue.idl',
-    'css/CSSRule.idl',
-    'css/CSSRuleList.idl',
-    'css/CSSStyleDeclaration.idl',
-    'css/CSSStyleRule.idl',
-    'css/CSSStyleSheet.idl',
-    'css/CSSUnknownRule.idl',
-    'css/CSSValue.idl',
-    'css/CSSValueList.idl',
-    'css/MediaList.idl',
-    'css/Rect.idl',
-    'css/RGBColor.idl',
-    'css/StyleSheet.idl',
-    'css/StyleSheetList.idl',
-
-    'dom/Attr.idl',
-    'dom/CDATASection.idl',
-    'dom/CharacterData.idl',
-    'dom/Clipboard.idl',                          # port only
-    'dom/Comment.idl',
-    'dom/Document.idl',
-    'dom/DocumentFragment.idl',
-    'dom/DocumentType.idl',
-    'dom/DOMCoreException.idl',
-    'dom/DOMImplementation.idl',
-    'dom/Element.idl',
-    'dom/Entity.idl',
-    'dom/EntityReference.idl',
-    'dom/Event.idl',
-    'dom/EventException.idl',
-    'dom/EventListener.idl',
-    'dom/EventTarget.idl',
-    'dom/EventTargetNode.idl',                    # port only
-    'dom/KeyboardEvent.idl',
-    'dom/MessageEvent.idl',
-    'dom/MouseEvent.idl',
-    'dom/MutationEvent.idl',
-    'dom/NamedNodeMap.idl',
-    'dom/Node.idl',
-    'dom/NodeFilter.idl',
-    'dom/NodeIterator.idl',
-    'dom/NodeList.idl',
-    'dom/Notation.idl',
-    'dom/OverflowEvent.idl',
-    'dom/ProcessingInstruction.idl',
-    'dom/ProgressEvent.idl',
-    'dom/Range.idl',
-    'dom/RangeException.idl',
-    'dom/Text.idl',
-    'dom/TextEvent.idl',
-    'dom/TreeWalker.idl',
-    'dom/UIEvent.idl',
-    'dom/WheelEvent.idl',
-
-    'html/CanvasGradient.idl',
-    'html/CanvasPattern.idl',
-    'html/CanvasRenderingContext2D.idl',
-    'html/HTMLAnchorElement.idl',
-    'html/HTMLAppletElement.idl',
-    'html/HTMLAreaElement.idl',
-    'html/HTMLAudioElement.idl',
-    'html/HTMLBaseElement.idl',
-    'html/HTMLBaseFontElement.idl',
-    'html/HTMLBlockquoteElement.idl',
-    'html/HTMLBodyElement.idl',
-    'html/HTMLBRElement.idl',
-    'html/HTMLButtonElement.idl',
-    'html/HTMLCanvasElement.idl',
-    'html/HTMLCollection.idl',
-    'html/HTMLDirectoryElement.idl',
-    'html/HTMLDivElement.idl',
-    'html/HTMLDListElement.idl',
-    'html/HTMLDocument.idl',
-    'html/HTMLElement.idl',
-    'html/HTMLEmbedElement.idl',
-    'html/HTMLFieldSetElement.idl',
-    'html/HTMLFontElement.idl',
-    'html/HTMLFormElement.idl',
-    'html/HTMLFrameElement.idl',
-    'html/HTMLFrameSetElement.idl',
-    'html/HTMLHeadElement.idl',
-    'html/HTMLHeadingElement.idl',
-    'html/HTMLHRElement.idl',
-    'html/HTMLHtmlElement.idl',
-    'html/HTMLIFrameElement.idl',
-    'html/HTMLImageElement.idl',
-    'html/HTMLInputElement.idl',
-    'html/HTMLIsIndexElement.idl',
-    'html/HTMLLabelElement.idl',
-    'html/HTMLLegendElement.idl',
-    'html/HTMLLIElement.idl',
-    'html/HTMLLinkElement.idl',
-    'html/HTMLMapElement.idl',
-    'html/HTMLMarqueeElement.idl',
-    'html/HTMLMediaElement.idl',
-    'html/HTMLMenuElement.idl',
-    'html/HTMLMetaElement.idl',
-    'html/HTMLModElement.idl',
-    'html/HTMLObjectElement.idl',
-    'html/HTMLOListElement.idl',
-    'html/HTMLOptGroupElement.idl',
-    'html/HTMLOptionElement.idl',
-    'html/HTMLOptionsCollection.idl',
-    'html/HTMLParagraphElement.idl',
-    'html/HTMLParamElement.idl',
-    'html/HTMLPreElement.idl',
-    'html/HTMLQuoteElement.idl',
-    'html/HTMLScriptElement.idl',
-    'html/HTMLSelectElement.idl',
-    'html/HTMLSelectionInputElement.idl',         # port only
-    'html/HTMLSourceElement.idl',
-    'html/HTMLStyleElement.idl',
-    'html/HTMLTableCaptionElement.idl',
-    'html/HTMLTableCellElement.idl',
-    'html/HTMLTableColElement.idl',
-    'html/HTMLTableElement.idl',
-    'html/HTMLTableRowElement.idl',
-    'html/HTMLTableSectionElement.idl',
-    'html/HTMLTextAreaElement.idl',
-    'html/HTMLTitleElement.idl',
-    'html/HTMLUListElement.idl',
-    'html/UndetectableHTMLCollection.idl',        # port only
-    'html/HTMLVideoElement.idl',
-    'html/MediaError.idl',
-    'html/TimeRanges.idl',
-    'html/VoidCallback.idl',
-
-    'page/AbstractView.idl',
-    'page/BarInfo.idl',
-    'page/Console.idl',
-    'page/DOMSelection.idl',
-    'page/DOMWindow.idl',
-    'page/History.idl',
-    'page/Screen.idl',
-
-    'page/inspector/InspectorController.idl',     # port only
-
-    'page/Navigator.idl',                          # port only
-    'page/Location.idl',                           # port only
-
-
-    'xml/DOMParser.idl',
-    'xml/DOMParser.idl',
-    'xml/XMLHttpRequest.idl',                     # port only
-    'xml/XMLHttpRequestException.idl',
-    'xml/XMLSerializer.idl',
-    'xml/XPathEvaluator.idl',
-    'xml/XPathException.idl',
-    'xml/XPathExpression.idl',
-    'xml/XPathNSResolver.idl',
-    'xml/XPathResult.idl',
-    'xml/XSLTProcessor.idl',                      # port only
-
-    'ksvg2/svg/SVGMatrix.idl',                    # port only
-    'ksvg2/svg/SVGPathSegList.idl',               # port only
-    'ksvg2/svg/SVGPointList.idl',                 # port only
-    'ksvg2/svg/SVGTransformList.idl',             # port only
-
-    'svg/SVGLength.idl',
-    'svg/SVGElement.idl',
-    'svg/SVGAElement.idl',
-    'svg/SVGURIReference.idl',
-    'svg/SVGRect.idl',
-    'svg/SVGRectElement.idl',
-    'svg/SVGRenderingIntent.idl',
-    'svg/SVGAngle.idl',
-    'svg/SVGAnimateColorElement.idl',
-    'svg/SVGAnimateElement.idl',
-    'svg/SVGAnimateTransformElement.idl',
-    'svg/SVGAnimatedAngle.idl',
-    'svg/SVGAnimatedBoolean.idl',
-    'svg/SVGAnimatedEnumeration.idl',
-    'svg/SVGAnimatedInteger.idl',
-    'svg/SVGAnimatedLength.idl',
-    'svg/SVGAnimatedLengthList.idl',
-    'svg/SVGAnimatedNumber.idl',
-    'svg/SVGAnimatedNumberList.idl',
-    'svg/SVGAnimatedPathData.idl',
-    'svg/SVGAnimatedPoints.idl',
-    'svg/SVGAnimatedPreserveAspectRatio.idl',
-    'svg/SVGAnimatedRect.idl',
-    'svg/SVGAnimatedString.idl',
-    'svg/SVGAnimatedTransformList.idl',
-    'svg/SVGAnimationElement.idl',
-    'svg/SVGCircleElement.idl',
-    'svg/SVGClipPathElement.idl',
-    'svg/SVGColor.idl',
-    'svg/SVGComponentTransferFunctionElement.idl',
-    'svg/SVGCursorElement.idl',
-    'svg/SVGDefinitionSrcElement.idl',
-    'svg/SVGDefsElement.idl',
-    'svg/SVGDescElement.idl',
-    'svg/SVGDocument.idl',
-    'svg/SVGElement.idl',
-    'svg/SVGElementInstance.idl',
-    'svg/SVGElementInstanceList.idl',
-    'svg/SVGEllipseElement.idl',
-    'svg/SVGException.idl',
-    'svg/SVGExternalResourcesRequired.idl',
-    'svg/SVGFEBlendElement.idl',
-    'svg/SVGFEColorMatrixElement.idl',
-    'svg/SVGFEComponentTransferElement.idl',
-    'svg/SVGFECompositeElement.idl',
-    'svg/SVGFEDiffuseLightingElement.idl',
-    'svg/SVGFEDisplacementMapElement.idl',
-    'svg/SVGFEDistantLightElement.idl',
-    'svg/SVGFEFloodElement.idl',
-    'svg/SVGFEFuncAElement.idl',
-    'svg/SVGFEFuncBElement.idl',
-    'svg/SVGFEFuncGElement.idl',
-    'svg/SVGFEFuncRElement.idl',
-    'svg/SVGFEGaussianBlurElement.idl',
-    'svg/SVGFEImageElement.idl',
-    'svg/SVGFEMergeElement.idl',
-    'svg/SVGFEMergeNodeElement.idl',
-    'svg/SVGFEOffsetElement.idl',
-    'svg/SVGFEPointLightElement.idl',
-    'svg/SVGFESpecularLightingElement.idl',
-    'svg/SVGFESpotLightElement.idl',
-    'svg/SVGFETileElement.idl',
-    'svg/SVGFETurbulenceElement.idl',
-    'svg/SVGFontElement.idl',
-    'svg/SVGFontFaceElement.idl',
-    'svg/SVGFontFaceFormatElement.idl',
-    'svg/SVGFontFaceNameElement.idl',
-    'svg/SVGFontFaceSrcElement.idl',
-    'svg/SVGFontFaceUriElement.idl',
-    'svg/SVGFilterElement.idl',
-    'svg/SVGFilterPrimitiveStandardAttributes.idl',
-    'svg/SVGFitToViewBox.idl',
-    'svg/SVGForeignObjectElement.idl',
-    'svg/SVGGElement.idl',
-    'svg/SVGGlyphElement.idl',
-    'svg/SVGGradientElement.idl',
-    'svg/SVGImageElement.idl',
-    'svg/SVGLangSpace.idl',
-    'svg/SVGLength.idl',
-    'svg/SVGLengthList.idl',
-    'svg/SVGLineElement.idl',
-    'svg/SVGLinearGradientElement.idl',
-    'svg/SVGLocatable.idl',
-    'svg/SVGMarkerElement.idl',
-    'svg/SVGMaskElement.idl',
-    'svg/SVGMetadataElement.idl',
-    'svg/SVGMissingGlyphElement.idl',
-    'svg/SVGNumber.idl',
-    'svg/SVGNumberList.idl',
-    'svg/SVGPaint.idl',
-    'svg/SVGPathElement.idl',
-    'svg/SVGPathSeg.idl',
-    'svg/SVGPathSegArcAbs.idl',
-    'svg/SVGPathSegArcRel.idl',
-    'svg/SVGPathSegClosePath.idl',
-    'svg/SVGPathSegCurvetoCubicAbs.idl',
-    'svg/SVGPathSegCurvetoCubicRel.idl',
-    'svg/SVGPathSegCurvetoCubicSmoothAbs.idl',
-    'svg/SVGPathSegCurvetoCubicSmoothRel.idl',
-    'svg/SVGPathSegCurvetoQuadraticAbs.idl',
-    'svg/SVGPathSegCurvetoQuadraticRel.idl',
-    'svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl',
-    'svg/SVGPathSegCurvetoQuadraticSmoothRel.idl',
-    'svg/SVGPathSegLinetoAbs.idl',
-    'svg/SVGPathSegLinetoHorizontalAbs.idl',
-    'svg/SVGPathSegLinetoHorizontalRel.idl',
-    'svg/SVGPathSegLinetoRel.idl',
-    'svg/SVGPathSegLinetoVerticalAbs.idl',
-    'svg/SVGPathSegLinetoVerticalRel.idl',
-    'svg/SVGPathSegMovetoAbs.idl',
-    'svg/SVGPathSegMovetoRel.idl',
-    'svg/SVGPatternElement.idl',
-    'svg/SVGPoint.idl',
-    'svg/SVGPolygonElement.idl',
-    'svg/SVGPolylineElement.idl',
-    'svg/SVGPreserveAspectRatio.idl',
-    'svg/SVGRadialGradientElement.idl',
-    'svg/SVGRect.idl',
-    'svg/SVGRectElement.idl',
-    'svg/SVGRenderingIntent.idl',
-    'svg/SVGSVGElement.idl',
-    'svg/SVGScriptElement.idl',
-    'svg/SVGSetElement.idl',
-    'svg/SVGStopElement.idl',
-    'svg/SVGStringList.idl',
-    'svg/SVGStylable.idl',
-    'svg/SVGStyleElement.idl',
-    'svg/SVGSwitchElement.idl',
-    'svg/SVGSymbolElement.idl',
-    'svg/SVGTRefElement.idl',
-    'svg/SVGTSpanElement.idl',
-    'svg/SVGTests.idl',
-    'svg/SVGTextContentElement.idl',
-    'svg/SVGTextElement.idl',
-    'svg/SVGTextPathElement.idl',
-    'svg/SVGTextPositioningElement.idl',
-    'svg/SVGTitleElement.idl',
-    'svg/SVGTransform.idl',
-    'svg/SVGTransformable.idl',
-    'svg/SVGURIReference.idl',
-    'svg/SVGUnitTypes.idl',
-    'svg/SVGUseElement.idl',
-    'svg/SVGViewElement.idl',
-    'svg/SVGZoomAndPan.idl',
-    'svg/SVGZoomEvent.idl',
-]
-
-for subdir in set([os.path.dirname(n) for n in idl_files]):
-  dir = env.Dir('#/$BUILD_TYPE/webkit/port/' + subdir)
-
-  dir.addRepository(env.Dir('#/../webkit/pending'))
-  dir.addRepository(env.Dir('#/../webkit/port/' + subdir))
-  dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore/' + subdir))
-
-for name in idl_files:
-  env.Bindings('$WEBKIT_DIR/port/' + name)
-
-
-# copy over some files
-i = env.Install('$SHARED_DIR',
-                ['$WEBKIT_PORT_DIR/bindings/js/PausedTimeouts.h',
-                 '$WEBKIT_PORT_DIR/bindings/js/PausedTimeouts.cpp'])
-env.Alias('webkit', i)
-
-
-
-# HTML tag and attribute names
-env.Command(['$DERIVED_DIR/HTMLNames.cpp',
-             '$DERIVED_DIR/HTMLNames.h'],
-            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
-             '$WEBKIT_PORT_DIR/html/HTMLTagNames.in',
-             '$WEBKIT_PORT_DIR/html/HTMLAttributeNames.in'],
-            '$PERL ${SOURCES[0].posix} ' + \
-            '--tags ${SOURCES[1].posix} ' + \
-            '--attrs ${SOURCES[2].posix} ' + \
-            '--namespace HTML --namespacePrefix xhtml ' + \
-            '--cppNamespace WebCore ' + \
-            '--namespaceURI "http://www.w3.org/1999/xhtml" ' + \
-            '--attrsNullNamespace --output $DERIVED_DIR')
-
-env.Command(['$DERIVED_DIR/XMLNames.cpp',
-             '$DERIVED_DIR/XMLNames.h'],
-            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
-             '$WEBKIT_PORT_DIR/xml/xmlattrs.in'],
-            '$PERL ${SOURCES[0].posix} ' + \
-            '--attrs ${SOURCES[1].posix} ' + \
-            '--namespace XML --cppNamespace WebCore ' + \
-            '--namespaceURI "http://www.w3.org/XML/1998/namespace" ' + \
-            '--output $DERIVED_DIR')
-
-env.Command(['$DERIVED_DIR/SVGElementFactory.cpp',
-             '$DERIVED_DIR/SVGElementFactory.h',
-             '$DERIVED_DIR/SVGNames.cpp',
-             '$DERIVED_DIR/SVGNames.h'],
-            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
-             '$WEBKIT_PORT_DIR/svg/svgtags.in',
-             '$WEBKIT_PORT_DIR/svg/svgattrs.in'],
-            '$PERL ${SOURCES[0].posix} ' + \
-            '--tags ${SOURCES[1].posix} ' + \
-            '--attrs ${SOURCES[2].posix} ' + \
-            '--extraDefines "$SVG_FLAGS" ' +  \
-            '--namespace SVG --cppNamespace WebCore ' + \
-            '--namespaceURI "http://www.w3.org/2000/svg" ' + \
-            '--factory --attrsNullNamespace --output $DERIVED_DIR')
-
-env.Command(['$DERIVED_DIR/XLinkNames.cpp',
-             '$DERIVED_DIR/XLinkNames.h'],
-            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
-             '$WEBKIT_PORT_DIR/svg/xlinkattrs.in'],
-            '$PERL ${SOURCES[0].posix} ' + \
-            '--attrs ${SOURCES[1].posix} ' + \
-            '--namespace XLink --cppNamespace WebCore ' + \
-            '--namespaceURI "http://www.w3.org/1999/xlink" ' + \
-            '--output $DERIVED_DIR')
-
-# Add SVG Symbols to the WebCore exported symbols file
-# TODO(bradnelson): fix this
-#WebCore.exp : WebCore.base.exp WebCore.SVG.exp
-#	cat $^ > $@
-
-
-env.Command('$DERIVED_DIR/html4.css',
-            ['$WEBKIT_PORT_DIR/css/html4.css',
-             '$PORTROOT/css/html4-overrides.css'],
-            'type $SOURCES > $TARGETS')
-
-env.Command('$DERIVED_DIR/quirks.css',
-            ['$WEBKIT_PORT_DIR/css/quirks.css',
-             '$PORTROOT/css/quirks-overrides.css'],
-            'type $SOURCES > $TARGETS')
-
-env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h',
-             '$DERIVED_DIR/UserAgentStyleSheetsData.cpp'],
-            ['$WEBKIT_PORT_DIR/css/make-css-file-arrays.pl',
-             '$WEBKIT_PORT_DIR/css/view-source.css',
-             '$WEBKIT_PORT_DIR/css/svg.css',
-             '$DERIVED_DIR/html4.css',
-             '$DERIVED_DIR/quirks.css'],
-            '$PERL ${SOURCES[0].posix} ${TARGETS.posix} ${SOURCES[1:].posix}')
-
-env.Command(['$DERIVED_DIR/XPathGrammar.cpp',
-             '$DERIVED_DIR/XPathGrammar.h'],
-            ['$WEBKIT_PORT_DIR/xml/XPathGrammar.y'],
-            '$YACC -d -p xpathyy ${SOURCES[0].posix} -o ${TARGET.posix} && ' + \
-            'echo #ifndef XPathGrammar_h ' + \
-               '> $DERIVED_DIR\\XPathGrammar.h && ' + \
-            'echo #define XPathGrammar_h ' + \
-               '>> $DERIVED_DIR\\XPathGrammar.h && ' + \
-            'type $DERIVED_DIR\\XPathGrammar.hpp ' + \
-               '>> $DERIVED_DIR\\XPathGrammar.h && ' + \
-            'echo #endif ' + \
-               '>> $DERIVED_DIR\\XPathGrammar.h && ' + \
-            'del $DERIVED_DIR\\XPathGrammar.hpp')
-
-env.Command(['$DERIVED_DIR/CSSGrammar.cpp',
-             '$DERIVED_DIR/CSSGrammar.h'],
-            ['$WEBKIT_PORT_DIR/css/CSSGrammar.y'],
-            '$YACC -d -p cssyy ${SOURCES[0].posix} -o ${TARGET.posix} && ' + \
-            'echo #ifndef CSSGrammar_h ' + \
-               '> $DERIVED_DIR\\CSSGrammar.h && ' + \
-            'echo #define CSSGrammar_h ' + \
-               '>> $DERIVED_DIR\\CSSGrammar.h && ' + \
-            'type $DERIVED_DIR\\CSSGrammar.hpp ' + \
-               '>> $DERIVED_DIR\\CSSGrammar.h && ' + \
-            'echo #endif ' + \
-               '>> $DERIVED_DIR\\CSSGrammar.h && ' + \
-            'del $DERIVED_DIR\\CSSGrammar.hpp')
-
-# TODO(bradnelson): need to add in error checking
-
-env.Command('$WEBKIT_PORT_DIR/SVGCSSValueKeywords.in',
-            '$WEBKIT_PORT_DIR/css/SVGCSSValueKeywords.in',
-            '$PERL -ne "print lc" $SOURCES > $TARGET')
-
-env.Command('$WEBKIT_PORT_DIR/CSSValueKeywords.in',
-            ['$WEBKIT_PORT_DIR/css/CSSValueKeywords.in',
-             '$WEBKIT_PORT_DIR/css/SVGCSSValueKeywords.in'],
-            '$PERL -ne "print lc" $SOURCES > $TARGET')
-
-env.Command('$WEBKIT_PORT_DIR/CSSPropertyNames.in',
-            ['$WEBKIT_PORT_DIR/css/CSSPropertyNames.in',
-             '$WEBKIT_PORT_DIR/css/SVGCSSPropertyNames.in'],
-            '$PERL -ne "print lc" $SOURCES > $TARGET')
-
-env.Command(['$DERIVED_DIR/CSSValueKeywords.c',
-             '$DERIVED_DIR/CSSValueKeywords.h'],
-            ['#/../webkit/pending/makevalues.pl',
-             '$WEBKIT_PORT_DIR/CSSValueKeywords.in'],
-            ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}',
-             Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'),
-             Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),
-            ])
-
-env.Command(['$DERIVED_DIR/CSSPropertyNames.c',
-             '$DERIVED_DIR/CSSPropertyNames.h'],
-            ['#/../webkit/pending/makeprop.pl',
-             '$WEBKIT_PORT_DIR/CSSPropertyNames.in'],
-            ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}',
-             Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'),
-             Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),
-            ])
-
-
-# DOCTYPE strings
-env.Command('$DERIVED_DIR/DocTypeStrings.cpp',
-            '$WEBKIT_PORT_DIR/html/DocTypeStrings.gperf',
-            'gperf -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ' + \
-            ',PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards ' + \
-            '$SOURCE > $TARGET')
-
-# color names
-env.Command('$DERIVED_DIR/ColorData.c',
-            '$WEBKIT_PORT_DIR/platform/ColorData.gperf',
-            'gperf -CDEot -L ANSI-C -k "*" -N findColor -D -s 2 ' + \
-            '$SOURCE > $TARGET')
-
-# HTML entity names
-env.Command('$DERIVED_DIR/HTMLEntityNames.c',
-            '$WEBKIT_PORT_DIR/html/HTMLEntityNames.gperf',
-            'gperf -a -L ANSI-C -C -G -c -o -t -k "*" -N findEntity ' + \
-            '-D -s 2 $SOURCE > $TARGET')
-
-env.Command('$DERIVED_DIR/HTMLEntityCodes.c',
-            '$WEBKIT_PORT_DIR/html/HTMLEntityNames.gperf',
-            'perl $WEBKIT_BUILD/WebCore/generate_entitycodes.pl ' + \
-            '$SOURCE > $TARGET')
-
-# CSS tokenizer
-env.Command('$DERIVED_DIR/tokenizer.cpp',
-            ['$WEBKIT_PORT_DIR/css/tokenizer.flex',
-             '$WEBKIT_PORT_DIR/css/maketokenizer'],
-            'flex -t $SOURCE | perl ${SOURCES[1]} > $TARGET')
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os.path
+import re
+
+Import('env')
+
+webcore = env.Dir('$WEBKIT_DIR/WebCore')
+webcore_posix = webcore.abspath.replace('\\', '/')
+
+cygwin = env.Dir('$CYGWIN_DIR/bin')
+cygwin_posix = cygwin.abspath.replace('\\', '/')
+
+pending = env.Dir('#../webkit/pending')
+portroot = env.Dir('#../webkit/port')
+webkit_build = env.Dir('#../webkit/build')
+bindings_output_dir = env.Dir('#/../webkit/$BUILD_TYPE/scons/V8Bindings')
+
+
+env = env.Clone(
+    WEBCORE = webcore,
+    PORTROOT = portroot,
+    WEBKIT_BUILD = webkit_build,
+
+    BINDINGS_SCRIPTS_DIR = '$WEBKIT_DIR/port/bindings/scripts',
+    BINDINGS_SCRIPT = '$BINDINGS_SCRIPTS_DIR/generate-bindings.pl',
+
+    PERL_INCLUDE_PATH = ['$BINDINGS_SCRIPTS_DIR',
+                         '#/../third_party/WebKit/WebCore/bindings/scripts'],
+
+    WEBKIT_PORT_DIR = '$WEBKIT_DIR/port',
+
+    FEATURE_DEFINES = [
+        'ENABLE_CROSS_DOCUMENT_MESSAGING',
+        'ENABLE_XSLT',
+        'ENABLE_XPATH',
+        'ENABLE_SVG',
+        'ENABLE_SVG_FOREIGN_OBJECT',
+        'ENABLE_SVG_USE',
+        'ENABLE_SVG_AS_IMAGE',
+        'ENABLE_SVG_FONTS',
+    ],
+
+    SVG_FLAGS = [
+        'ENABLE_SVG_FOREIGN_OBJECT=1',
+        'ENABLE_SVG_USE=1',
+        'ENABLE_SVG_AS_IMAGE=1',
+        'ENABLE_SVG_FONTS=1',
+    ],
+
+    BINDINGS_INCLUDE_PATH = [
+        '$WEBCORE/dom',
+        '$WEBCORE/html',
+        '$WEBCORE/css',
+        '$WEBCORE/page',
+        '$WEBCORE/xml',
+        '$WEBCORE/svg',
+    ],
+    BINDINGS_INCLUDE_FLAG = '--include ',
+    BINDINGS_INCLUDE_SUFFIX = '',
+    _BINDINGS_INCLUDE_FLAGS = '${_concat(BINDINGS_INCLUDE_FLAG, ' + \
+                                        'BINDINGS_INCLUDE_PATH, ' + \
+                                        'BINDINGS_INCLUDE_SUFFIX, ' + \
+                                        '__env__, RDirs, TARGET, SOURCE)}',
+)
+
+env.PrependENVPath('PATH', cygwin_posix)
+
+bindings_perl_modules = env.Glob('$BINDINGS_SCRIPTS_DIR/*.pm')
+
+
+def BindingsEmitter(target, source, env):
+  source.append('$BINDINGS_SCRIPT')
+  try:
+    idl_contents = open(source[0].rfile().abspath, 'r').read()
+  except EnvironmentError:
+    return target, source
+  idl_contents = re.sub('//[^\\n]*\\n', '', idl_contents)
+  interfaces = re.findall('interface\\s*(?:\\[[^]]+\\])?\\s*'
+                          '(\\w+)[^{]*[{]', idl_contents)
+  new_target = []
+  for i in interfaces:
+    new_cpp = '$DERIVED_DIR/${BINDINGSPREFIX}' + i + '.cpp'
+    new_h = '$DERIVED_DIR/${BINDINGSPREFIX}' + i + '.h'
+    new_target.extend([new_cpp, new_h])
+    env.Depends(new_cpp, bindings_perl_modules)
+    env.Depends(new_h, bindings_perl_modules)
+  return new_target, source
+
+
+env.Append(
+    BUILDERS = {'Bindings' : Builder(action = '$BINDINGSCOM',
+                                     src_suffix = '.idl',
+                                     emitter = BindingsEmitter,
+                                    ),
+               },
+)
+env.Replace(
+    # TODO(bradnelson): don't have the path change here!!!
+    # TODO(bradnelson): fix ugly hack with one include!
+    BINDINGSCOM = '$PERL $_PERL_INCLUDE_FLAGS ' + \
+                  '${SOURCES[1]} ' + \
+                  '--include ../webkit/port/dom ' + \
+                  '--include ../third_party/WebKit/WebCore/svg ' + \
+                  '--defines "$FEATURE_DEFINES $BINDINGS_LANGUAGE" ' + \
+                  '--generator $BINDINGS_GENERATOR_ARG ' + \
+                  '$_BINDINGS_INCLUDE_FLAGS ' + \
+                  '--outputdir ${TARGET.dir} ' + \
+                  '${SOURCES[0].posix}',
+)
+
+if env['PLATFORM'] == 'mac':  # Mac OS X
+  env['BINDINGSPREFIX'] = 'DOM'
+  env['BINDINGS_GENERATOR_ARG'] = 'ObjC'
+  env['BINDINGS_LANGUAGE'] = 'LANGUAGE_OBJECTIVE_C'
+  env.Append(BINDINGS_INCLUDE_PATH = [ 'bindings/js' ])
+elif False:
+  env['BINDINGSPREFIX'] = 'JS'
+  env['BINDINGS_GENERATOR_ARG'] = 'JS'
+  env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT'
+  env.Append(BINDINGS_INCLUDE_PATH = [ 'bindings/js' ])
+elif True:
+  env['BINDINGSPREFIX'] = 'V8'
+  env['BINDINGS_GENERATOR_ARG'] = 'V8'
+  env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT V8_BINDING'
+  env.Prepend(PERL_INCLUDE_PATH = [ '$PORTROOT/bindings/scripts' ])
+  env.Prepend(BINDINGS_INCLUDE_PATH = [
+                '$PORTROOT/dom',
+                '$PORTROOT/html',
+                '$PORTROOT/page',
+                '$PORTROOT/xml',
+              ])
+else:
+  print 'I am not going to generate bindings for you!'
+
+
+idl_files = [
+    'css/Counter.idl',
+    'css/CSSCharsetRule.idl',
+    'css/CSSFontFaceRule.idl',
+    'css/CSSImportRule.idl',
+    'css/CSSMediaRule.idl',
+    'css/CSSPageRule.idl',
+    'css/CSSPrimitiveValue.idl',
+    'css/CSSRule.idl',
+    'css/CSSRuleList.idl',
+    'css/CSSStyleDeclaration.idl',
+    'css/CSSStyleRule.idl',
+    'css/CSSStyleSheet.idl',
+    'css/CSSUnknownRule.idl',
+    'css/CSSValue.idl',
+    'css/CSSValueList.idl',
+    'css/MediaList.idl',
+    'css/Rect.idl',
+    'css/RGBColor.idl',
+    'css/StyleSheet.idl',
+    'css/StyleSheetList.idl',
+
+    'dom/Attr.idl',
+    'dom/CDATASection.idl',
+    'dom/CharacterData.idl',
+    'dom/Clipboard.idl',                          # port only
+    'dom/Comment.idl',
+    'dom/Document.idl',
+    'dom/DocumentFragment.idl',
+    'dom/DocumentType.idl',
+    'dom/DOMCoreException.idl',
+    'dom/DOMImplementation.idl',
+    'dom/Element.idl',
+    'dom/Entity.idl',
+    'dom/EntityReference.idl',
+    'dom/Event.idl',
+    'dom/EventException.idl',
+    'dom/EventListener.idl',
+    'dom/EventTarget.idl',
+    'dom/EventTargetNode.idl',                    # port only
+    'dom/KeyboardEvent.idl',
+    'dom/MessageEvent.idl',
+    'dom/MouseEvent.idl',
+    'dom/MutationEvent.idl',
+    'dom/NamedNodeMap.idl',
+    'dom/Node.idl',
+    'dom/NodeFilter.idl',
+    'dom/NodeIterator.idl',
+    'dom/NodeList.idl',
+    'dom/Notation.idl',
+    'dom/OverflowEvent.idl',
+    'dom/ProcessingInstruction.idl',
+    'dom/ProgressEvent.idl',
+    'dom/Range.idl',
+    'dom/RangeException.idl',
+    'dom/Text.idl',
+    'dom/TextEvent.idl',
+    'dom/TreeWalker.idl',
+    'dom/UIEvent.idl',
+    'dom/WheelEvent.idl',
+
+    'html/CanvasGradient.idl',
+    'html/CanvasPattern.idl',
+    'html/CanvasRenderingContext2D.idl',
+    'html/HTMLAnchorElement.idl',
+    'html/HTMLAppletElement.idl',
+    'html/HTMLAreaElement.idl',
+    'html/HTMLAudioElement.idl',
+    'html/HTMLBaseElement.idl',
+    'html/HTMLBaseFontElement.idl',
+    'html/HTMLBlockquoteElement.idl',
+    'html/HTMLBodyElement.idl',
+    'html/HTMLBRElement.idl',
+    'html/HTMLButtonElement.idl',
+    'html/HTMLCanvasElement.idl',
+    'html/HTMLCollection.idl',
+    'html/HTMLDirectoryElement.idl',
+    'html/HTMLDivElement.idl',
+    'html/HTMLDListElement.idl',
+    'html/HTMLDocument.idl',
+    'html/HTMLElement.idl',
+    'html/HTMLEmbedElement.idl',
+    'html/HTMLFieldSetElement.idl',
+    'html/HTMLFontElement.idl',
+    'html/HTMLFormElement.idl',
+    'html/HTMLFrameElement.idl',
+    'html/HTMLFrameSetElement.idl',
+    'html/HTMLHeadElement.idl',
+    'html/HTMLHeadingElement.idl',
+    'html/HTMLHRElement.idl',
+    'html/HTMLHtmlElement.idl',
+    'html/HTMLIFrameElement.idl',
+    'html/HTMLImageElement.idl',
+    'html/HTMLInputElement.idl',
+    'html/HTMLIsIndexElement.idl',
+    'html/HTMLLabelElement.idl',
+    'html/HTMLLegendElement.idl',
+    'html/HTMLLIElement.idl',
+    'html/HTMLLinkElement.idl',
+    'html/HTMLMapElement.idl',
+    'html/HTMLMarqueeElement.idl',
+    'html/HTMLMediaElement.idl',
+    'html/HTMLMenuElement.idl',
+    'html/HTMLMetaElement.idl',
+    'html/HTMLModElement.idl',
+    'html/HTMLObjectElement.idl',
+    'html/HTMLOListElement.idl',
+    'html/HTMLOptGroupElement.idl',
+    'html/HTMLOptionElement.idl',
+    'html/HTMLOptionsCollection.idl',
+    'html/HTMLParagraphElement.idl',
+    'html/HTMLParamElement.idl',
+    'html/HTMLPreElement.idl',
+    'html/HTMLQuoteElement.idl',
+    'html/HTMLScriptElement.idl',
+    'html/HTMLSelectElement.idl',
+    'html/HTMLSelectionInputElement.idl',         # port only
+    'html/HTMLSourceElement.idl',
+    'html/HTMLStyleElement.idl',
+    'html/HTMLTableCaptionElement.idl',
+    'html/HTMLTableCellElement.idl',
+    'html/HTMLTableColElement.idl',
+    'html/HTMLTableElement.idl',
+    'html/HTMLTableRowElement.idl',
+    'html/HTMLTableSectionElement.idl',
+    'html/HTMLTextAreaElement.idl',
+    'html/HTMLTitleElement.idl',
+    'html/HTMLUListElement.idl',
+    'html/UndetectableHTMLCollection.idl',        # port only
+    'html/HTMLVideoElement.idl',
+    'html/MediaError.idl',
+    'html/TimeRanges.idl',
+    'html/VoidCallback.idl',
+
+    'page/AbstractView.idl',
+    'page/BarInfo.idl',
+    'page/Console.idl',
+    'page/DOMSelection.idl',
+    'page/DOMWindow.idl',
+    'page/History.idl',
+    'page/Screen.idl',
+
+    'page/inspector/InspectorController.idl',     # port only
+
+    'page/Navigator.idl',                          # port only
+    'page/Location.idl',                           # port only
+
+
+    'xml/DOMParser.idl',
+    'xml/DOMParser.idl',
+    'xml/XMLHttpRequest.idl',                     # port only
+    'xml/XMLHttpRequestException.idl',
+    'xml/XMLSerializer.idl',
+    'xml/XPathEvaluator.idl',
+    'xml/XPathException.idl',
+    'xml/XPathExpression.idl',
+    'xml/XPathNSResolver.idl',
+    'xml/XPathResult.idl',
+    'xml/XSLTProcessor.idl',                      # port only
+
+    'ksvg2/svg/SVGMatrix.idl',                    # port only
+    'ksvg2/svg/SVGPathSegList.idl',               # port only
+    'ksvg2/svg/SVGPointList.idl',                 # port only
+    'ksvg2/svg/SVGTransformList.idl',             # port only
+
+    'svg/SVGLength.idl',
+    'svg/SVGElement.idl',
+    'svg/SVGAElement.idl',
+    'svg/SVGURIReference.idl',
+    'svg/SVGRect.idl',
+    'svg/SVGRectElement.idl',
+    'svg/SVGRenderingIntent.idl',
+    'svg/SVGAngle.idl',
+    'svg/SVGAnimateColorElement.idl',
+    'svg/SVGAnimateElement.idl',
+    'svg/SVGAnimateTransformElement.idl',
+    'svg/SVGAnimatedAngle.idl',
+    'svg/SVGAnimatedBoolean.idl',
+    'svg/SVGAnimatedEnumeration.idl',
+    'svg/SVGAnimatedInteger.idl',
+    'svg/SVGAnimatedLength.idl',
+    'svg/SVGAnimatedLengthList.idl',
+    'svg/SVGAnimatedNumber.idl',
+    'svg/SVGAnimatedNumberList.idl',
+    'svg/SVGAnimatedPathData.idl',
+    'svg/SVGAnimatedPoints.idl',
+    'svg/SVGAnimatedPreserveAspectRatio.idl',
+    'svg/SVGAnimatedRect.idl',
+    'svg/SVGAnimatedString.idl',
+    'svg/SVGAnimatedTransformList.idl',
+    'svg/SVGAnimationElement.idl',
+    'svg/SVGCircleElement.idl',
+    'svg/SVGClipPathElement.idl',
+    'svg/SVGColor.idl',
+    'svg/SVGComponentTransferFunctionElement.idl',
+    'svg/SVGCursorElement.idl',
+    'svg/SVGDefinitionSrcElement.idl',
+    'svg/SVGDefsElement.idl',
+    'svg/SVGDescElement.idl',
+    'svg/SVGDocument.idl',
+    'svg/SVGElement.idl',
+    'svg/SVGElementInstance.idl',
+    'svg/SVGElementInstanceList.idl',
+    'svg/SVGEllipseElement.idl',
+    'svg/SVGException.idl',
+    'svg/SVGExternalResourcesRequired.idl',
+    'svg/SVGFEBlendElement.idl',
+    'svg/SVGFEColorMatrixElement.idl',
+    'svg/SVGFEComponentTransferElement.idl',
+    'svg/SVGFECompositeElement.idl',
+    'svg/SVGFEDiffuseLightingElement.idl',
+    'svg/SVGFEDisplacementMapElement.idl',
+    'svg/SVGFEDistantLightElement.idl',
+    'svg/SVGFEFloodElement.idl',
+    'svg/SVGFEFuncAElement.idl',
+    'svg/SVGFEFuncBElement.idl',
+    'svg/SVGFEFuncGElement.idl',
+    'svg/SVGFEFuncRElement.idl',
+    'svg/SVGFEGaussianBlurElement.idl',
+    'svg/SVGFEImageElement.idl',
+    'svg/SVGFEMergeElement.idl',
+    'svg/SVGFEMergeNodeElement.idl',
+    'svg/SVGFEOffsetElement.idl',
+    'svg/SVGFEPointLightElement.idl',
+    'svg/SVGFESpecularLightingElement.idl',
+    'svg/SVGFESpotLightElement.idl',
+    'svg/SVGFETileElement.idl',
+    'svg/SVGFETurbulenceElement.idl',
+    'svg/SVGFontElement.idl',
+    'svg/SVGFontFaceElement.idl',
+    'svg/SVGFontFaceFormatElement.idl',
+    'svg/SVGFontFaceNameElement.idl',
+    'svg/SVGFontFaceSrcElement.idl',
+    'svg/SVGFontFaceUriElement.idl',
+    'svg/SVGFilterElement.idl',
+    'svg/SVGFilterPrimitiveStandardAttributes.idl',
+    'svg/SVGFitToViewBox.idl',
+    'svg/SVGForeignObjectElement.idl',
+    'svg/SVGGElement.idl',
+    'svg/SVGGlyphElement.idl',
+    'svg/SVGGradientElement.idl',
+    'svg/SVGImageElement.idl',
+    'svg/SVGLangSpace.idl',
+    'svg/SVGLength.idl',
+    'svg/SVGLengthList.idl',
+    'svg/SVGLineElement.idl',
+    'svg/SVGLinearGradientElement.idl',
+    'svg/SVGLocatable.idl',
+    'svg/SVGMarkerElement.idl',
+    'svg/SVGMaskElement.idl',
+    'svg/SVGMetadataElement.idl',
+    'svg/SVGMissingGlyphElement.idl',
+    'svg/SVGNumber.idl',
+    'svg/SVGNumberList.idl',
+    'svg/SVGPaint.idl',
+    'svg/SVGPathElement.idl',
+    'svg/SVGPathSeg.idl',
+    'svg/SVGPathSegArcAbs.idl',
+    'svg/SVGPathSegArcRel.idl',
+    'svg/SVGPathSegClosePath.idl',
+    'svg/SVGPathSegCurvetoCubicAbs.idl',
+    'svg/SVGPathSegCurvetoCubicRel.idl',
+    'svg/SVGPathSegCurvetoCubicSmoothAbs.idl',
+    'svg/SVGPathSegCurvetoCubicSmoothRel.idl',
+    'svg/SVGPathSegCurvetoQuadraticAbs.idl',
+    'svg/SVGPathSegCurvetoQuadraticRel.idl',
+    'svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl',
+    'svg/SVGPathSegCurvetoQuadraticSmoothRel.idl',
+    'svg/SVGPathSegLinetoAbs.idl',
+    'svg/SVGPathSegLinetoHorizontalAbs.idl',
+    'svg/SVGPathSegLinetoHorizontalRel.idl',
+    'svg/SVGPathSegLinetoRel.idl',
+    'svg/SVGPathSegLinetoVerticalAbs.idl',
+    'svg/SVGPathSegLinetoVerticalRel.idl',
+    'svg/SVGPathSegMovetoAbs.idl',
+    'svg/SVGPathSegMovetoRel.idl',
+    'svg/SVGPatternElement.idl',
+    'svg/SVGPoint.idl',
+    'svg/SVGPolygonElement.idl',
+    'svg/SVGPolylineElement.idl',
+    'svg/SVGPreserveAspectRatio.idl',
+    'svg/SVGRadialGradientElement.idl',
+    'svg/SVGRect.idl',
+    'svg/SVGRectElement.idl',
+    'svg/SVGRenderingIntent.idl',
+    'svg/SVGSVGElement.idl',
+    'svg/SVGScriptElement.idl',
+    'svg/SVGSetElement.idl',
+    'svg/SVGStopElement.idl',
+    'svg/SVGStringList.idl',
+    'svg/SVGStylable.idl',
+    'svg/SVGStyleElement.idl',
+    'svg/SVGSwitchElement.idl',
+    'svg/SVGSymbolElement.idl',
+    'svg/SVGTRefElement.idl',
+    'svg/SVGTSpanElement.idl',
+    'svg/SVGTests.idl',
+    'svg/SVGTextContentElement.idl',
+    'svg/SVGTextElement.idl',
+    'svg/SVGTextPathElement.idl',
+    'svg/SVGTextPositioningElement.idl',
+    'svg/SVGTitleElement.idl',
+    'svg/SVGTransform.idl',
+    'svg/SVGTransformable.idl',
+    'svg/SVGURIReference.idl',
+    'svg/SVGUnitTypes.idl',
+    'svg/SVGUseElement.idl',
+    'svg/SVGViewElement.idl',
+    'svg/SVGZoomAndPan.idl',
+    'svg/SVGZoomEvent.idl',
+]
+
+for subdir in set([os.path.dirname(n) for n in idl_files]):
+  dir = env.Dir('#/$BUILD_TYPE/webkit/port/' + subdir)
+
+  dir.addRepository(env.Dir('#/../webkit/pending'))
+  dir.addRepository(env.Dir('#/../webkit/port/' + subdir))
+  dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore/' + subdir))
+
+for name in idl_files:
+  env.Bindings('$WEBKIT_DIR/port/' + name)
+
+
+# copy over some files
+i = env.Install('$SHARED_DIR',
+                ['$WEBKIT_PORT_DIR/bindings/js/PausedTimeouts.h',
+                 '$WEBKIT_PORT_DIR/bindings/js/PausedTimeouts.cpp'])
+env.Alias('webkit', i)
+
+
+
+# HTML tag and attribute names
+env.Command(['$DERIVED_DIR/HTMLNames.cpp',
+             '$DERIVED_DIR/HTMLNames.h'],
+            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
+             '$WEBKIT_PORT_DIR/html/HTMLTagNames.in',
+             '$WEBKIT_PORT_DIR/html/HTMLAttributeNames.in'],
+            '$PERL ${SOURCES[0].posix} ' + \
+            '--tags ${SOURCES[1].posix} ' + \
+            '--attrs ${SOURCES[2].posix} ' + \
+            '--namespace HTML --namespacePrefix xhtml ' + \
+            '--cppNamespace WebCore ' + \
+            '--namespaceURI "http://www.w3.org/1999/xhtml" ' + \
+            '--attrsNullNamespace --output $DERIVED_DIR')
+
+env.Command(['$DERIVED_DIR/XMLNames.cpp',
+             '$DERIVED_DIR/XMLNames.h'],
+            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
+             '$WEBKIT_PORT_DIR/xml/xmlattrs.in'],
+            '$PERL ${SOURCES[0].posix} ' + \
+            '--attrs ${SOURCES[1].posix} ' + \
+            '--namespace XML --cppNamespace WebCore ' + \
+            '--namespaceURI "http://www.w3.org/XML/1998/namespace" ' + \
+            '--output $DERIVED_DIR')
+
+env.Command(['$DERIVED_DIR/SVGElementFactory.cpp',
+             '$DERIVED_DIR/SVGElementFactory.h',
+             '$DERIVED_DIR/SVGNames.cpp',
+             '$DERIVED_DIR/SVGNames.h'],
+            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
+             '$WEBKIT_PORT_DIR/svg/svgtags.in',
+             '$WEBKIT_PORT_DIR/svg/svgattrs.in'],
+            '$PERL ${SOURCES[0].posix} ' + \
+            '--tags ${SOURCES[1].posix} ' + \
+            '--attrs ${SOURCES[2].posix} ' + \
+            '--extraDefines "$SVG_FLAGS" ' +  \
+            '--namespace SVG --cppNamespace WebCore ' + \
+            '--namespaceURI "http://www.w3.org/2000/svg" ' + \
+            '--factory --attrsNullNamespace --output $DERIVED_DIR')
+
+env.Command(['$DERIVED_DIR/XLinkNames.cpp',
+             '$DERIVED_DIR/XLinkNames.h'],
+            ['$WEBKIT_PORT_DIR/dom/make_names.pl',
+             '$WEBKIT_PORT_DIR/svg/xlinkattrs.in'],
+            '$PERL ${SOURCES[0].posix} ' + \
+            '--attrs ${SOURCES[1].posix} ' + \
+            '--namespace XLink --cppNamespace WebCore ' + \
+            '--namespaceURI "http://www.w3.org/1999/xlink" ' + \
+            '--output $DERIVED_DIR')
+
+# Add SVG Symbols to the WebCore exported symbols file
+# TODO(bradnelson): fix this
+#WebCore.exp : WebCore.base.exp WebCore.SVG.exp
+#	cat $^ > $@
+
+
+env.Command('$DERIVED_DIR/html4.css',
+            ['$WEBKIT_PORT_DIR/css/html4.css',
+             '$PORTROOT/css/html4-overrides.css'],
+            'type $SOURCES > $TARGETS')
+
+env.Command('$DERIVED_DIR/quirks.css',
+            ['$WEBKIT_PORT_DIR/css/quirks.css',
+             '$PORTROOT/css/quirks-overrides.css'],
+            'type $SOURCES > $TARGETS')
+
+env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h',
+             '$DERIVED_DIR/UserAgentStyleSheetsData.cpp'],
+            ['$WEBKIT_PORT_DIR/css/make-css-file-arrays.pl',
+             '$WEBKIT_PORT_DIR/css/view-source.css',
+             '$WEBKIT_PORT_DIR/css/svg.css',
+             '$DERIVED_DIR/html4.css',
+             '$DERIVED_DIR/quirks.css'],
+            '$PERL ${SOURCES[0].posix} ${TARGETS.posix} ${SOURCES[1:].posix}')
+
+env.Command(['$DERIVED_DIR/XPathGrammar.cpp',
+             '$DERIVED_DIR/XPathGrammar.h'],
+            ['$WEBKIT_PORT_DIR/xml/XPathGrammar.y'],
+            '$YACC -d -p xpathyy ${SOURCES[0].posix} -o ${TARGET.posix} && ' + \
+            'echo #ifndef XPathGrammar_h ' + \
+               '> $DERIVED_DIR\\XPathGrammar.h && ' + \
+            'echo #define XPathGrammar_h ' + \
+               '>> $DERIVED_DIR\\XPathGrammar.h && ' + \
+            'type $DERIVED_DIR\\XPathGrammar.hpp ' + \
+               '>> $DERIVED_DIR\\XPathGrammar.h && ' + \
+            'echo #endif ' + \
+               '>> $DERIVED_DIR\\XPathGrammar.h && ' + \
+            'del $DERIVED_DIR\\XPathGrammar.hpp')
+
+env.Command(['$DERIVED_DIR/CSSGrammar.cpp',
+             '$DERIVED_DIR/CSSGrammar.h'],
+            ['$WEBKIT_PORT_DIR/css/CSSGrammar.y'],
+            '$YACC -d -p cssyy ${SOURCES[0].posix} -o ${TARGET.posix} && ' + \
+            'echo #ifndef CSSGrammar_h ' + \
+               '> $DERIVED_DIR\\CSSGrammar.h && ' + \
+            'echo #define CSSGrammar_h ' + \
+               '>> $DERIVED_DIR\\CSSGrammar.h && ' + \
+            'type $DERIVED_DIR\\CSSGrammar.hpp ' + \
+               '>> $DERIVED_DIR\\CSSGrammar.h && ' + \
+            'echo #endif ' + \
+               '>> $DERIVED_DIR\\CSSGrammar.h && ' + \
+            'del $DERIVED_DIR\\CSSGrammar.hpp')
+
+# TODO(bradnelson): need to add in error checking
+
+env.Command('$WEBKIT_PORT_DIR/SVGCSSValueKeywords.in',
+            '$WEBKIT_PORT_DIR/css/SVGCSSValueKeywords.in',
+            '$PERL -ne "print lc" $SOURCES > $TARGET')
+
+env.Command('$WEBKIT_PORT_DIR/CSSValueKeywords.in',
+            ['$WEBKIT_PORT_DIR/css/CSSValueKeywords.in',
+             '$WEBKIT_PORT_DIR/css/SVGCSSValueKeywords.in'],
+            '$PERL -ne "print lc" $SOURCES > $TARGET')
+
+env.Command('$WEBKIT_PORT_DIR/CSSPropertyNames.in',
+            ['$WEBKIT_PORT_DIR/css/CSSPropertyNames.in',
+             '$WEBKIT_PORT_DIR/css/SVGCSSPropertyNames.in'],
+            '$PERL -ne "print lc" $SOURCES > $TARGET')
+
+env.Command(['$DERIVED_DIR/CSSValueKeywords.c',
+             '$DERIVED_DIR/CSSValueKeywords.h'],
+            ['#/../webkit/pending/makevalues.pl',
+             '$WEBKIT_PORT_DIR/CSSValueKeywords.in'],
+            ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}',
+             Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'),
+             Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),
+            ])
+
+env.Command(['$DERIVED_DIR/CSSPropertyNames.c',
+             '$DERIVED_DIR/CSSPropertyNames.h'],
+            ['#/../webkit/pending/makeprop.pl',
+             '$WEBKIT_PORT_DIR/CSSPropertyNames.in'],
+            ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}',
+             Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'),
+             Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),
+            ])
+
+
+# DOCTYPE strings
+env.Command('$DERIVED_DIR/DocTypeStrings.cpp',
+            '$WEBKIT_PORT_DIR/html/DocTypeStrings.gperf',
+            'gperf -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ' + \
+            ',PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards ' + \
+            '$SOURCE > $TARGET')
+
+# color names
+env.Command('$DERIVED_DIR/ColorData.c',
+            '$WEBKIT_PORT_DIR/platform/ColorData.gperf',
+            'gperf -CDEot -L ANSI-C -k "*" -N findColor -D -s 2 ' + \
+            '$SOURCE > $TARGET')
+
+# HTML entity names
+env.Command('$DERIVED_DIR/HTMLEntityNames.c',
+            '$WEBKIT_PORT_DIR/html/HTMLEntityNames.gperf',
+            'gperf -a -L ANSI-C -C -G -c -o -t -k "*" -N findEntity ' + \
+            '-D -s 2 $SOURCE > $TARGET')
+
+env.Command('$DERIVED_DIR/HTMLEntityCodes.c',
+            '$WEBKIT_PORT_DIR/html/HTMLEntityNames.gperf',
+            'perl $WEBKIT_BUILD/WebCore/generate_entitycodes.pl ' + \
+            '$SOURCE > $TARGET')
+
+# CSS tokenizer
+env.Command('$DERIVED_DIR/tokenizer.cpp',
+            ['$WEBKIT_PORT_DIR/css/tokenizer.flex',
+             '$WEBKIT_PORT_DIR/css/maketokenizer'],
+            'flex -t $SOURCE | perl ${SOURCES[1]} > $TARGET')
+
diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript
index ebe27b4..e07fd4f 100644
--- a/webkit/default_plugin/SConscript
+++ b/webkit/default_plugin/SConscript
@@ -1,68 +1,68 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '#/../webkit/glue',
-        '$ICU38/public/common',
-        '$ICU38/public/i18n',
-        '#/../third_party/libxml/include',
-        '#/../third_party/npapi',
-        '#/..',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'LIBXML_STATIC',
-    ],
-    CCFLAGS = [
-        '/TP',
-
-        '/WX',
-        '/Wp64',
-    ],
-)
-
-input_files = [
-    'activex_installer.cc',
-    'default_plugin.cc',
-    'plugin_main.cc',
-    'plugin_impl.cc',
-    'plugin_database_handler.cc',
-    'plugin_install_job_monitor.cc',
-    'install_dialog.cc',
-]
-
-env.ChromeStaticLibrary('default_plugin', input_files)
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Prepend(
+    CPPPATH = [
+        '#/../webkit/glue',
+        '$ICU38/public/common',
+        '$ICU38/public/i18n',
+        '#/../third_party/libxml/include',
+        '#/../third_party/npapi',
+        '#/..',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'U_STATIC_IMPLEMENTATION',
+        'LIBXML_STATIC',
+    ],
+    CCFLAGS = [
+        '/TP',
+
+        '/WX',
+        '/Wp64',
+    ],
+)
+
+input_files = [
+    'activex_installer.cc',
+    'default_plugin.cc',
+    'plugin_main.cc',
+    'plugin_impl.cc',
+    'plugin_database_handler.cc',
+    'plugin_install_job_monitor.cc',
+    'install_dialog.cc',
+]
+
+env.ChromeStaticLibrary('default_plugin', input_files)
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index bb331e0..760b067 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -1,107 +1,107 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Append(
-  CCFLAGS = [
-    '/TP',
-
-    '/WX',
-
-    '/wd4800',
-  ],
-)
-
-input_files = [
-    '$PENDING_DIR/AccessibleBase.cpp',
-    '$PENDING_DIR/AccessibleDocument.cpp',
-    'alt_404_page_resource_fetcher.cc',
-    'alt_error_page_resource_fetcher.cc',
-    'autocomplete_input_listener.cc',
-    'cache_manager.cc',
-    'chrome_client_impl.cc',
-    'context_menu_client_impl.cc',
-    'cpp_binding_example.cc',
-    'cpp_bound_class.cc',
-    'cpp_variant.cc',
-    'debugger.cc',
-    'dom_operations.cc',
-    'dom_serializer.cc',
-    'dragclient_impl.cc',
-    'editor_client_impl.cc',
-    'entity_map.cc',
-    'event_conversion.cc',
-    'feed_preview.cc',
-    'glue_serialize.cc',
-    'glue_util.cc',
-    'image_decoder.cc',
-    'image_resource_fetcher.cc',
-    'inspector_client_impl.cc',
-    'localized_strings.cc',
-    'multipart_response_delegate.cc',
-    'npruntime_util.cc',
-    'password_autocomplete_listener.cc',
-    'password_form_dom_manager.cc',
-    'plugins/mozilla_extensions.cc',
-    'plugins/plugin_data_stream.cc',
-    'plugins/plugin_host.cc',
-    'plugins/plugin_instance.cc',
-    'plugins/plugin_lib.cc',
-    'plugins/plugin_list.cc',
-    'plugins/plugin_stream.cc',
-    'plugins/plugin_stream_url.cc',
-    'plugins/plugin_string_stream.cc',
-    'plugins/webplugin_delegate_impl.cc',
-    'resource_fetcher.cc',
-    'resource_handle_win.cc',
-    'searchable_form_data.cc',
-    'simple_clipboard_impl.cc',
-    'webcursor.cc',
-    'webdatasource_impl.cc',
-    'webdocumentloader_impl.cc',
-    'webdropdata.cc',
-    'weberror_impl.cc',
-    'webframe_impl.cc',
-    'webframeloaderclient_impl.cc',
-    'webhistoryitem_impl.cc',
-    'webinputevent.cc',
-    'webkit_glue.cc',
-    'webplugin_impl.cc',
-    'webtextinput_impl.cc',
-    'weburlrequest_impl.cc',
-    'webview_impl.cc',
-    'webwidget_impl.cc',
-]
-
-env.ChromeStaticLibrary('Glue', input_files)
-
-
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env')
+
+env = env.Clone()
+
+env.Append(
+  CCFLAGS = [
+    '/TP',
+
+    '/WX',
+
+    '/wd4800',
+  ],
+)
+
+input_files = [
+    '$PENDING_DIR/AccessibleBase.cpp',
+    '$PENDING_DIR/AccessibleDocument.cpp',
+    'alt_404_page_resource_fetcher.cc',
+    'alt_error_page_resource_fetcher.cc',
+    'autocomplete_input_listener.cc',
+    'cache_manager.cc',
+    'chrome_client_impl.cc',
+    'context_menu_client_impl.cc',
+    'cpp_binding_example.cc',
+    'cpp_bound_class.cc',
+    'cpp_variant.cc',
+    'debugger.cc',
+    'dom_operations.cc',
+    'dom_serializer.cc',
+    'dragclient_impl.cc',
+    'editor_client_impl.cc',
+    'entity_map.cc',
+    'event_conversion.cc',
+    'feed_preview.cc',
+    'glue_serialize.cc',
+    'glue_util.cc',
+    'image_decoder.cc',
+    'image_resource_fetcher.cc',
+    'inspector_client_impl.cc',
+    'localized_strings.cc',
+    'multipart_response_delegate.cc',
+    'npruntime_util.cc',
+    'password_autocomplete_listener.cc',
+    'password_form_dom_manager.cc',
+    'plugins/mozilla_extensions.cc',
+    'plugins/plugin_data_stream.cc',
+    'plugins/plugin_host.cc',
+    'plugins/plugin_instance.cc',
+    'plugins/plugin_lib.cc',
+    'plugins/plugin_list.cc',
+    'plugins/plugin_stream.cc',
+    'plugins/plugin_stream_url.cc',
+    'plugins/plugin_string_stream.cc',
+    'plugins/webplugin_delegate_impl.cc',
+    'resource_fetcher.cc',
+    'resource_handle_win.cc',
+    'searchable_form_data.cc',
+    'simple_clipboard_impl.cc',
+    'webcursor.cc',
+    'webdatasource_impl.cc',
+    'webdocumentloader_impl.cc',
+    'webdropdata.cc',
+    'weberror_impl.cc',
+    'webframe_impl.cc',
+    'webframeloaderclient_impl.cc',
+    'webhistoryitem_impl.cc',
+    'webinputevent.cc',
+    'webkit_glue.cc',
+    'webplugin_impl.cc',
+    'webtextinput_impl.cc',
+    'weburlrequest_impl.cc',
+    'webview_impl.cc',
+    'webwidget_impl.cc',
+]
+
+env.ChromeStaticLibrary('Glue', input_files)
+
+