Enforce Terminate on Heap Corruption in most of our executable on Windows XP SP3 or Vista.

This won't submit the crash dump but it's still better than nothing.

Fix broken alignment on test_shell_main.cc.
Review URL: http://codereview.chromium.org/3105

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

19 files changed, 262 insertions, 223 deletions

diff --git a/base/process_util.h b/base/process_util.h
index 1a50e4a..e5e3e92 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -258,6 +258,10 @@ class ProcessMetrics {
 // Note: Returns true on Windows 2000 without doing anything.
 bool EnableLowFragmentationHeap();
 
+// Enable 'terminate on heap corruption' flag. Helps protect against heap
+// overflow. Has no effect if the OS doesn't provide the necessary facility.
+void EnableTerminationOnHeapCorruption();
+
 // If supported on the platform, and the user has sufficent rights, increase
 // the current process's scheduling priority to a high priority.
 void RaiseProcessToHighPriority();
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 96f05bb..4d2f1e5 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -23,6 +23,10 @@ int GetProcId(ProcessHandle process) {
   return process;
 }
 
+void EnableTerminationOnHeapCorruption() {
+  // On POSIX, there nothing to do AFAIK.
+}
+
 void RaiseProcessToHighPriority() {
   // On POSIX, we don't actually do anything here.  We could try to nice() or
   // setpriority() or sched_getscheduler, but these all require extra rights.
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index 24689a1..b464336 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -598,6 +598,11 @@ bool EnableLowFragmentationHeap() {
   return true;
 }
 
+void EnableTerminationOnHeapCorruption() {
+  // Ignore the result code. Supported on XP SP3 and Vista.
+  HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+}
+
 void RaiseProcessToHighPriority() {
   SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
 }
diff --git a/base/run_all_unittests.cc b/base/run_all_unittests.cc
index c0b131f..4ab019a 100644
--- a/base/run_all_unittests.cc
+++ b/base/run_all_unittests.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/process_util.h"
 #include "base/test_suite.h"
 
 int main(int argc, char** argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return TestSuite(argc, argv).Run();
 }
-
diff --git a/chrome/app/chrome.exe.deps b/chrome/app/chrome.exe.deps
index 8bb18eb..354426d 100644
--- a/chrome/app/chrome.exe.deps
+++ b/chrome/app/chrome.exe.deps
@@ -6,6 +6,7 @@ dependents = [
   'ADVAPI32.dll',

   'SHELL32.dll',

   'VERSION.dll',  # Used by breakpad

+  'winmm.dll',

 ]

 

 dependents_google_chrome = [

diff --git a/chrome/app/chrome_exe_main.cc b/chrome/app/chrome_exe_main.cc
index 3bf6439..cec04a9 100644
--- a/chrome/app/chrome_exe_main.cc
+++ b/chrome/app/chrome_exe_main.cc
@@ -9,6 +9,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
+#include "base/process_util.h"
 #include "chrome/app/breakpad.h"
 #include "chrome/app/client_util.h"
 #include "chrome/app/google_update_client.h"
@@ -19,6 +20,8 @@
 
 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
                       wchar_t* command_line, int show_command) {
+  process_util::EnableTerminationOnHeapCorruption();
+
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
 
diff --git a/chrome/common/ipc_tests.cc b/chrome/common/ipc_tests.cc
index 67d7140..9afbc67 100644
--- a/chrome/common/ipc_tests.cc
+++ b/chrome/common/ipc_tests.cc
@@ -378,6 +378,7 @@ HANDLE SpawnChild(ChildType child_type) {
 }
 
 int main(int argc, char** argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   // Some tests may use base::Singleton<>, thus we need to instanciate
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;  
diff --git a/chrome/installer/util/run_all_unittests.cc b/chrome/installer/util/run_all_unittests.cc
index c0b131f..4ab019a 100644
--- a/chrome/installer/util/run_all_unittests.cc
+++ b/chrome/installer/util/run_all_unittests.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/process_util.h"
 #include "base/test_suite.h"
 
 int main(int argc, char** argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return TestSuite(argc, argv).Run();
 }
-
diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc
index d671ff8..2b1e4e5 100644
--- a/chrome/test/perf/perftests.cc
+++ b/chrome/test/perf/perftests.cc
@@ -4,12 +4,14 @@
 
 #include "base/message_loop.h"
 #include "base/perftimer.h"
+#include "base/process_util.h"
 #include "chrome/common/chrome_paths.cc"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(darin): share code with base/run_all_perftests.cc
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   chrome::RegisterPathProvider();
   MessageLoop main_message_loop;
 
diff --git a/chrome/test/reliability/run_all_unittests.cc b/chrome/test/reliability/run_all_unittests.cc
index 9069b00..bb045ca 100644
--- a/chrome/test/reliability/run_all_unittests.cc
+++ b/chrome/test/reliability/run_all_unittests.cc
@@ -3,9 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
+#include "base/process_util.h"
 #include "chrome/test/reliability/reliability_test_suite.h"
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   return ReliabilityTestSuite(argc, argv).Run();
 }
 
diff --git a/chrome/test/ui/run_all_unittests.cc b/chrome/test/ui/run_all_unittests.cc
index 9b7ec72..4400f9b 100644
--- a/chrome/test/ui/run_all_unittests.cc
+++ b/chrome/test/ui/run_all_unittests.cc
@@ -4,10 +4,11 @@
 
 #include "base/at_exit.h"
 #include "base/platform_thread.h"
+#include "base/process_util.h"
 #include "chrome/test/ui/ui_test_suite.h"
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
   PlatformThread::SetName("Tests_Main");
   return UITestSuite(argc, argv).Run();
 }
-
diff --git a/chrome/test/unit/run_all_unittests.cc b/chrome/test/unit/run_all_unittests.cc
index 3ed4a73..97d6719 100644
--- a/chrome/test/unit/run_all_unittests.cc
+++ b/chrome/test/unit/run_all_unittests.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "build/build_config.h"
+#include "base/process_util.h"
 
 #include "base/test_suite.h"
 
@@ -12,6 +13,7 @@
 #endif
 
 int main(int argc, char **argv) {
+  process_util::EnableTerminationOnHeapCorruption();
 #if defined(OS_WIN)
   // TODO(port): This is not Windows-specific, but needs to be ported.
   return ChromeTestSuite(argc, argv).Run();
@@ -19,4 +21,3 @@ int main(int argc, char **argv) {
   return TestSuite(argc, argv).Run();
 #endif
 }
-
diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index 536253f..bf0a820 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc
@@ -14,6 +14,7 @@
 #include <stdio.h>
 
 #include "base/icu_util.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/third_party/hunspell/google/bdict_reader.h"
 #include "chrome/third_party/hunspell/google/bdict_writer.h"
@@ -69,6 +70,7 @@ int PrintHelp() {
 }  // namespace
 
 int main(int argc, char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc != 2)
     return PrintHelp();
 
diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc
index ef96878..f10b69b 100644
--- a/chrome/tools/perf/flush_cache/flush_cache.cc
+++ b/chrome/tools/perf/flush_cache/flush_cache.cc
@@ -6,10 +6,12 @@
 // It's useful for testing Chrome with a cold database.
 
 #include "base/string_piece.h"
+#include "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/test/test_file_util.h"
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc <= 1) {
     fprintf(stderr, "flushes disk cache for files\n");
     fprintf(stderr, "usage: %s <filenames>\n", argv[0]);
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc
index b8484c8..99098af 100644
--- a/chrome/tools/profiles/generate_profile.cc
+++ b/chrome/tools/profiles/generate_profile.cc
@@ -11,6 +11,7 @@
 #include "base/icu_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
@@ -178,6 +179,7 @@ void InsertURLBatch(const std::wstring& profile_dir, int page_id,
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   base::AtExitManager exit_manager;
 
   int next_arg = 1;
diff --git a/chrome/tools/test/image_diff/image_diff.cc b/chrome/tools/test/image_diff/image_diff.cc
index 04c648a..7b06ed3 100644
--- a/chrome/tools/test/image_diff/image_diff.cc
+++ b/chrome/tools/test/image_diff/image_diff.cc
@@ -15,6 +15,7 @@
 #include "base/command_line.h"
 #include "base/gfx/png_decoder.h"
 #include "base/logging.h"
+#include "base/process_util.h"
 #include "base/scoped_ptr.h"
 
 // Causes the app to remain open, waiting for pairs of filenames on stdin.
@@ -228,6 +229,7 @@ int CompareImages(const char* file1, const char* file2) {
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   CommandLine parsed_command_line;
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.
diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc
index d919fde..943caec 100644
--- a/net/tools/tld_cleanup/tld_cleanup.cc
+++ b/net/tools/tld_cleanup/tld_cleanup.cc
@@ -25,6 +25,7 @@
 #include "base/icu_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
@@ -205,6 +206,7 @@ NormalizeResult NormalizeFile(const std::wstring& in_filename,
 }
 
 int main(int argc, const char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   if (argc != 3) {
     fprintf(stderr, "Normalizes and verifies UTF-8 TLD data files\n");
     fprintf(stderr, "Usage: %s <input> <output>\n", argv[0]);
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 1da6f78..8eaa0c5 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -11,6 +11,7 @@
 #include "base/at_exit.h"
 #include "base/icu_util.h"
 #include "base/message_loop.h"
+#include "base/process_util.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
@@ -26,6 +27,7 @@ const char* TestShellTest::kJavascriptDelayExitScript =
   "</script>";
 
 int main(int argc, char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
   // Some unittests may use base::Singleton<>, thus we need to instanciate
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;  
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 8f7ee3b..55fcc49 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -19,6 +19,7 @@
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/resource_util.h"
 #include "base/stack_container.h"
 #include "base/stats_table.h"
@@ -111,245 +112,245 @@ bool MinidumpCallback(const wchar_t *dumpPath,
 }
 }  // namespace
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
+  process_util::EnableTerminationOnHeapCorruption();
 #ifdef _CRTDBG_MAP_ALLOC
-    _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+  _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+  _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
 #endif
-    // Some tests may use base::Singleton<>, thus we need to instanciate
-    // the AtExitManager or else we will leak objects.
-    base::AtExitManager at_exit_manager;  
-
-    CommandLine parsed_command_line;
-    if (parsed_command_line.HasSwitch(test_shell::kStartupDialog))
-        MessageBox(NULL, L"attach to me?", L"test_shell", MB_OK);
-    //webkit_glue::SetLayoutTestMode(true);
-
-    // Allocate a message loop for this thread.  Although it is not used
-    // directly, its constructor sets up some necessary state.
-    MessageLoopForUI main_message_loop;
-
-    bool suppress_error_dialogs = 
-         (GetEnvironmentVariable(L"CHROME_HEADLESS", NULL, 0) ||
-         parsed_command_line.HasSwitch(test_shell::kNoErrorDialogs) ||
-         parsed_command_line.HasSwitch(test_shell::kLayoutTests));
-    TestShell::InitLogging(suppress_error_dialogs);
-
-    // Suppress abort message in v8 library in debugging mode.
-    // V8 calls abort() when it hits assertion errors.
-    if (suppress_error_dialogs) {
-        _set_abort_behavior(0, _WRITE_ABORT_MSG);
-    }
-
-    if (parsed_command_line.HasSwitch(test_shell::kEnableTracing))
-      base::TraceLog::StartTracing();
-
-    // Make the selection of network stacks early on before any consumers try to
-    // issue HTTP requests.
-    if (parsed_command_line.HasSwitch(test_shell::kUseNewHttp))
-      net::HttpNetworkLayer::UseWinHttp(false);
-
-    bool layout_test_mode =
-        parsed_command_line.HasSwitch(test_shell::kLayoutTests);
-
-    net::HttpCache::Mode cache_mode = net::HttpCache::NORMAL;
-    bool playback_mode = 
-      parsed_command_line.HasSwitch(test_shell::kPlaybackMode);
-    bool record_mode = 
-      parsed_command_line.HasSwitch(test_shell::kRecordMode);
-
-    if (playback_mode)
-      cache_mode = net::HttpCache::PLAYBACK;
-    else if (record_mode)
-      cache_mode = net::HttpCache::RECORD;
-
-    if (layout_test_mode ||
-        parsed_command_line.HasSwitch(test_shell::kEnableFileCookies))
-      net::CookieMonster::EnableFileScheme();
-
-    std::wstring cache_path =
-        parsed_command_line.GetSwitchValue(test_shell::kCacheDir);
-    if (cache_path.empty()) {
-      PathService::Get(base::DIR_EXE, &cache_path);
-      file_util::AppendToPath(&cache_path, L"cache");
-    }
-
-    // Initializing with a default context, which means no on-disk cookie DB,
-    // and no support for directory listings.
-    SimpleResourceLoaderBridge::Init(
-        new TestShellRequestContext(cache_path, cache_mode));
-
-    // Load ICU data tables
-    icu_util::Initialize();
-
-    // Config the network module so it has access to a limited set of resources.
-    net::NetModule::SetResourceProvider(NetResourceProvider);
-
-    INITCOMMONCONTROLSEX InitCtrlEx;
-
-    InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    InitCtrlEx.dwICC  = ICC_STANDARD_CLASSES;
-    InitCommonControlsEx(&InitCtrlEx);
-
-    bool interactive = !layout_test_mode;
-    TestShell::InitializeTestShell(interactive);
+  // Some tests may use base::Singleton<>, thus we need to instanciate
+  // the AtExitManager or else we will leak objects.
+  base::AtExitManager at_exit_manager;  
+
+  CommandLine parsed_command_line;
+  if (parsed_command_line.HasSwitch(test_shell::kStartupDialog))
+      MessageBox(NULL, L"attach to me?", L"test_shell", MB_OK);
+  //webkit_glue::SetLayoutTestMode(true);
+
+  // Allocate a message loop for this thread.  Although it is not used
+  // directly, its constructor sets up some necessary state.
+  MessageLoopForUI main_message_loop;
+
+  bool suppress_error_dialogs = 
+       (GetEnvironmentVariable(L"CHROME_HEADLESS", NULL, 0) ||
+       parsed_command_line.HasSwitch(test_shell::kNoErrorDialogs) ||
+       parsed_command_line.HasSwitch(test_shell::kLayoutTests));
+  TestShell::InitLogging(suppress_error_dialogs);
+
+  // Suppress abort message in v8 library in debugging mode.
+  // V8 calls abort() when it hits assertion errors.
+  if (suppress_error_dialogs) {
+    _set_abort_behavior(0, _WRITE_ABORT_MSG);
+  }
+
+  if (parsed_command_line.HasSwitch(test_shell::kEnableTracing))
+    base::TraceLog::StartTracing();
+
+  // Make the selection of network stacks early on before any consumers try to
+  // issue HTTP requests.
+  if (parsed_command_line.HasSwitch(test_shell::kUseNewHttp))
+    net::HttpNetworkLayer::UseWinHttp(false);
+
+  bool layout_test_mode =
+      parsed_command_line.HasSwitch(test_shell::kLayoutTests);
+
+  net::HttpCache::Mode cache_mode = net::HttpCache::NORMAL;
+  bool playback_mode = 
+    parsed_command_line.HasSwitch(test_shell::kPlaybackMode);
+  bool record_mode = 
+    parsed_command_line.HasSwitch(test_shell::kRecordMode);
+
+  if (playback_mode)
+    cache_mode = net::HttpCache::PLAYBACK;
+  else if (record_mode)
+    cache_mode = net::HttpCache::RECORD;
+
+  if (layout_test_mode ||
+      parsed_command_line.HasSwitch(test_shell::kEnableFileCookies))
+    net::CookieMonster::EnableFileScheme();
+
+  std::wstring cache_path =
+      parsed_command_line.GetSwitchValue(test_shell::kCacheDir);
+  if (cache_path.empty()) {
+    PathService::Get(base::DIR_EXE, &cache_path);
+    file_util::AppendToPath(&cache_path, L"cache");
+  }
+
+  // Initializing with a default context, which means no on-disk cookie DB,
+  // and no support for directory listings.
+  SimpleResourceLoaderBridge::Init(
+      new TestShellRequestContext(cache_path, cache_mode));
+
+  // Load ICU data tables
+  icu_util::Initialize();
+
+  // Config the network module so it has access to a limited set of resources.
+  net::NetModule::SetResourceProvider(NetResourceProvider);
+
+  INITCOMMONCONTROLSEX InitCtrlEx;
+
+  InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
+  InitCtrlEx.dwICC  = ICC_STANDARD_CLASSES;
+  InitCommonControlsEx(&InitCtrlEx);
+
+  bool interactive = !layout_test_mode;
+  TestShell::InitializeTestShell(interactive);
 
     if (parsed_command_line.HasSwitch(test_shell::kAllowScriptsToCloseWindows))
       TestShell::SetAllowScriptsToCloseWindows();
 
-    // Disable user themes for layout tests so pixel tests are consistent.
-    if (!interactive)
-      gfx::NativeTheme::instance()->DisableTheming();
-
-    if (parsed_command_line.HasSwitch(test_shell::kTestShellTimeOut)) {
-      const std::wstring timeout_str = parsed_command_line.GetSwitchValue(
-          test_shell::kTestShellTimeOut);
-      int timeout_ms = static_cast<int>(StringToInt64(timeout_str.c_str()));
-      if (timeout_ms > 0)
-        TestShell::SetFileTestTimeout(timeout_ms);
-    }
-
-    // Initialize global strings
-    TestShell::RegisterWindowClass();
-
-    // Treat the first loose value as the initial URL to open.
-    std::wstring uri;
-
-    // Default to a homepage if we're interactive.
-    if (interactive) {
-        PathService::Get(base::DIR_SOURCE_ROOT, &uri);
-        file_util::AppendToPath(&uri, L"webkit");
-        file_util::AppendToPath(&uri, L"data");
-        file_util::AppendToPath(&uri, L"test_shell");
-        file_util::AppendToPath(&uri, L"index.html");
+  // Disable user themes for layout tests so pixel tests are consistent.
+  if (!interactive)
+    gfx::NativeTheme::instance()->DisableTheming();
+
+  if (parsed_command_line.HasSwitch(test_shell::kTestShellTimeOut)) {
+    const std::wstring timeout_str = parsed_command_line.GetSwitchValue(
+        test_shell::kTestShellTimeOut);
+    int timeout_ms = static_cast<int>(StringToInt64(timeout_str.c_str()));
+    if (timeout_ms > 0)
+      TestShell::SetFileTestTimeout(timeout_ms);
+  }
+
+  // Initialize global strings
+  TestShell::RegisterWindowClass();
+
+  // Treat the first loose value as the initial URL to open.
+  std::wstring uri;
+
+  // Default to a homepage if we're interactive.
+  if (interactive) {
+    PathService::Get(base::DIR_SOURCE_ROOT, &uri);
+    file_util::AppendToPath(&uri, L"webkit");
+    file_util::AppendToPath(&uri, L"data");
+    file_util::AppendToPath(&uri, L"test_shell");
+    file_util::AppendToPath(&uri, L"index.html");
+  }
+
+  if (parsed_command_line.GetLooseValueCount() > 0) {
+    CommandLine::LooseValueIterator iter(
+        parsed_command_line.GetLooseValuesBegin());
+    uri = *iter;
+  }
+
+  if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) {
+    std::wstring dir(
+        parsed_command_line.GetSwitchValue(test_shell::kCrashDumps));
+    new google_breakpad::ExceptionHandler(dir, 0, &MinidumpCallback, 0, true);
+  }
+
+  std::wstring js_flags = 
+    parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
+  // Test shell always exposes the GC.
+  CommandLine::AppendSwitch(&js_flags, L"expose-gc");
+  webkit_glue::SetJavaScriptFlags(js_flags);
+
+  // load and initialize the stats table.
+  StatsTable *table = new StatsTable(kStatsFile, kStatsFileThreads, kStatsFileCounters);
+  StatsTable::set_current(table);
+
+  TestShell* shell;
+  if (TestShell::CreateNewWindow(uri, &shell)) {
+    if (record_mode || playback_mode) {
+      // Move the window to the upper left corner for consistent
+      // record/playback mode.  For automation, we want this to work
+      // on build systems where the script invoking us is a background
+      // process.  So for this case, make our window the topmost window
+      // as well.
+      ForegroundHelper::SetForeground(shell->mainWnd());
+      ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0);
+      // Tell webkit as well.
+      webkit_glue::SetRecordPlaybackMode(true);
     }
 
-    if (parsed_command_line.GetLooseValueCount() > 0) {
-        CommandLine::LooseValueIterator iter = parsed_command_line.GetLooseValuesBegin();
-        uri = *iter;
+    shell->Show(shell->webView(), NEW_WINDOW);
+
+    if (parsed_command_line.HasSwitch(test_shell::kDumpStatsTable))
+      shell->DumpStatsTableOnExit();
+
+    bool no_events = parsed_command_line.HasSwitch(test_shell::kNoEvents);
+    if ((record_mode || playback_mode) && !no_events) {
+      std::wstring script_path = cache_path;
+      // Create the cache directory in case it doesn't exist.
+      file_util::CreateDirectory(cache_path);
+      file_util::AppendToPath(&script_path, L"script.log");
+      if (record_mode)
+        base::EventRecorder::current()->StartRecording(script_path);
+      if (playback_mode)
+        base::EventRecorder::current()->StartPlayback(script_path);
     }
 
-    if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) {
-        std::wstring dir = parsed_command_line.GetSwitchValue(test_shell::kCrashDumps);
-        new google_breakpad::ExceptionHandler(dir, 0, &MinidumpCallback, 0, true);
+    if (parsed_command_line.HasSwitch(test_shell::kDebugMemoryInUse)) {
+      base::MemoryDebug::SetMemoryInUseEnabled(true);
+      // Dump all in use memory at startup
+      base::MemoryDebug::DumpAllMemoryInUse();
     }
 
-    std::wstring js_flags = 
-      parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
-    // Test shell always exposes the GC.
-    CommandLine::AppendSwitch(&js_flags, L"expose-gc");
-    webkit_glue::SetJavaScriptFlags(js_flags);
-
-    // load and initialize the stats table.
-    StatsTable *table = new StatsTable(kStatsFile, kStatsFileThreads, kStatsFileCounters);
-    StatsTable::set_current(table);
-
-    TestShell* shell;
-    if (TestShell::CreateNewWindow(uri, &shell)) {
-        if (record_mode || playback_mode) {
-          // Move the window to the upper left corner for consistent
-          // record/playback mode.  For automation, we want this to work
-          // on build systems where the script invoking us is a background
-          // process.  So for this case, make our window the topmost window
-          // as well.
-          ForegroundHelper::SetForeground(shell->mainWnd());
-          ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0);
-          // Tell webkit as well.
-          webkit_glue::SetRecordPlaybackMode(true);
-        }
-
-        shell->Show(shell->webView(), NEW_WINDOW);
-
-        if (parsed_command_line.HasSwitch(test_shell::kDumpStatsTable))
-          shell->DumpStatsTableOnExit();
-
-        bool no_events = parsed_command_line.HasSwitch(test_shell::kNoEvents);
-        if ((record_mode || playback_mode) && !no_events) {
-          std::wstring script_path = cache_path;
-          // Create the cache directory in case it doesn't exist.
-          file_util::CreateDirectory(cache_path);
-          file_util::AppendToPath(&script_path, L"script.log");
-          if (record_mode)
-            base::EventRecorder::current()->StartRecording(script_path);
-          if (playback_mode)
-            base::EventRecorder::current()->StartPlayback(script_path);
+    // See if we need to run the tests.
+    if (layout_test_mode) {
+      webkit_glue::SetLayoutTestMode(true);
+
+      // Set up for the kind of test requested.
+      TestShell::TestParams params;
+      if (parsed_command_line.HasSwitch(test_shell::kDumpPixels)) {
+        // The pixel test flag also gives the image file name to use.
+        params.dump_pixels = true;
+        params.pixel_file_name = parsed_command_line.GetSwitchValue(
+            test_shell::kDumpPixels);
+        if (params.pixel_file_name.size() == 0) {
+          fprintf(stderr, "No file specified for pixel tests");
+          exit(1);
         }
-
-        if (parsed_command_line.HasSwitch(test_shell::kDebugMemoryInUse)) {
-          base::MemoryDebug::SetMemoryInUseEnabled(true);
-          // Dump all in use memory at startup
-          base::MemoryDebug::DumpAllMemoryInUse();
+      }
+      if (parsed_command_line.HasSwitch(test_shell::kNoTree)) {
+          params.dump_tree = false;
+      }
+
+      if (uri.length() == 0) {
+        // Watch stdin for URLs.
+        char filenameBuffer[2048];
+        while (fgets(filenameBuffer, sizeof(filenameBuffer), stdin)) {
+          char *newLine = strchr(filenameBuffer, '\n');
+          if (newLine)
+            *newLine = '\0';
+          if (!*filenameBuffer)
+            continue;
+
+          SetCurrentTestName(filenameBuffer);
+
+          if (!TestShell::RunFileTest(filenameBuffer, params))
+            break;
         }
+      } else {
+        TestShell::RunFileTest(WideToUTF8(uri).c_str(), params);
+      }
 
-        // See if we need to run the tests.
-        if (layout_test_mode) {
-            webkit_glue::SetLayoutTestMode(true);
-
-            // Set up for the kind of test requested.
-            TestShell::TestParams params;
-            if (parsed_command_line.HasSwitch(test_shell::kDumpPixels)) {
-                // The pixel test flag also gives the image file name to use.
-                params.dump_pixels = true;
-                params.pixel_file_name = parsed_command_line.GetSwitchValue(
-                        test_shell::kDumpPixels);
-                if (params.pixel_file_name.size() == 0) {
-                    fprintf(stderr, "No file specified for pixel tests");
-                    exit(1);
-                }
-            }
-            if (parsed_command_line.HasSwitch(test_shell::kNoTree)) {
-                params.dump_tree = false;
-            }
-
-            if (uri.length() == 0) {
-                // Watch stdin for URLs.
-                char filenameBuffer[2048];
-                while (fgets(filenameBuffer, sizeof(filenameBuffer), stdin)) {
-                    char *newLine = strchr(filenameBuffer, '\n');
-                    if (newLine)
-                        *newLine = '\0';
-                    if (!*filenameBuffer)
-                        continue;
-
-                    SetCurrentTestName(filenameBuffer);
-
-                    if (!TestShell::RunFileTest(filenameBuffer, params))
-                        break;
-                }
-            } else {
-                TestShell::RunFileTest(WideToUTF8(uri).c_str(), params);
-            }
-
-            shell->CallJSGC();
-            shell->CallJSGC();
-            if (shell) delete shell;
-        } else {
-            MessageLoop::current()->Run();
-        }
+      shell->CallJSGC();
+      shell->CallJSGC();
+      if (shell) delete shell;
+    } else {
+      MessageLoop::current()->Run();
+    }
 
-        // Flush any remaining messages.  This ensures that any accumulated
-        // Task objects get destroyed before we exit, which avoids noise in
-        // purify leak-test results.
-        MessageLoop::current()->RunAllPending();
+    // Flush any remaining messages.  This ensures that any accumulated
+    // Task objects get destroyed before we exit, which avoids noise in
+    // purify leak-test results.
+    MessageLoop::current()->RunAllPending();
 
-        if (record_mode)
-          base::EventRecorder::current()->StopRecording();
-        if (playback_mode)
-          base::EventRecorder::current()->StopPlayback();
-    }
+    if (record_mode)
+      base::EventRecorder::current()->StopRecording();
+    if (playback_mode)
+      base::EventRecorder::current()->StopPlayback();
+  }
 
-    TestShell::ShutdownTestShell();
-    TestShell::CleanupLogging();
+  TestShell::ShutdownTestShell();
+  TestShell::CleanupLogging();
 
-    // Tear down shared StatsTable; prevents unit_tests from leaking it.
-    StatsTable::set_current(NULL);
-    delete table;
+  // Tear down shared StatsTable; prevents unit_tests from leaking it.
+  StatsTable::set_current(NULL);
+  delete table;
 
 #ifdef _CRTDBG_MAP_ALLOC
-    _CrtDumpMemoryLeaks();
+  _CrtDumpMemoryLeaks();
 #endif
-    return 0;
+  return 0;
 }
-
-