Handle destruction of test shell properly.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 106 matching lines @@
     text_input_controller_.reset(new TextInputController(this));
     navigation_controller_.reset(new TestNavigationController(this));
 
     URLRequestFilter* filter = URLRequestFilter::GetInstance();
     filter->AddHostnameHandler("test-shell-resource", "inspector", 
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
 }
 
 TestShell::~TestShell() {
-    // Call GC twice to clean up garbage.
-    CallJSGC();
-    CallJSGC();
+  // Navigate to an empty page to fire all the destruction logic for the
+  // current page.
+  LoadURL(L"about:blank");
 
-    PlatformCleanUp();
+  // Call GC twice to clean up garbage.
+  CallJSGC();
+  CallJSGC();
 
-    StatsTable *table = StatsTable::current();
-    if (dump_stats_table_on_exit_) {
-      // Dump the stats table.
-      printf("<stats>\n");
-      if (table != NULL) {
-          int counter_max = table->GetMaxCounters();
-          for (int index=0; index < counter_max; index++) {
-              std::string name(table->GetRowName(index));
-              if (name.length() > 0) {
-                  int value = table->GetRowValue(index);
-                  printf("%s:\t%d\n", name.c_str(), value);
-              }
-          }
+  PlatformCleanUp();
+
+  StatsTable *table = StatsTable::current();
+  if (dump_stats_table_on_exit_) {
+    // Dump the stats table.
+    printf("<stats>\n");
+    if (table != NULL) {
+      int counter_max = table->GetMaxCounters();
+      for (int index=0; index < counter_max; index++) {
+        std::string name(table->GetRowName(index));
+        if (name.length() > 0) {
+          int value = table->GetRowValue(index);
+          printf("%s:\t%d\n", name.c_str(), value);
+        }
       }
-      printf("</stats>\n");
     }
+    printf("</stats>\n");
+  }
 }
 
 void TestShell::ShutdownTestShell() {
 #if defined(OS_WIN) || defined(OS_MACOSX)
     PlatformShutdown();
 #endif
     SimpleResourceLoaderBridge::Shutdown();
     delete window_list_;
     delete TestShell::web_prefs_;
 }
@@ skipping 391 matching lines @@
 
 bool IsDefaultPluginEnabled() {
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
 }  // namespace webkit_glue