Set the svn:eol-style to LF on all SConscript files

TBR=evanm

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

31 files changed, 3729 insertions, 3729 deletions

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)