Refactor the DB code to make all DB layout tests pass on test_shell....

webkit/tools/test_shell/layout_test_controller.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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
+#include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using std::string;
 using std::wstring;
 
 using WebKit::WebConsoleMessage;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
@@ skipping 83 matching lines @@
   BindMethod("pauseAnimationAtTimeOnElementWithId", &LayoutTestController::pauseAnimationAtTimeOnElementWithId);
   BindMethod("pauseTransitionAtTimeOnElementWithId", &LayoutTestController::pauseTransitionAtTimeOnElementWithId);
   BindMethod("elementDoesAutoCompleteForElementWithId", &LayoutTestController::elementDoesAutoCompleteForElementWithId);
   BindMethod("numberOfActiveAnimations", &LayoutTestController::numberOfActiveAnimations);
   BindMethod("disableImageLoading", &LayoutTestController::disableImageLoading);
   BindMethod("setIconDatabaseEnabled", &LayoutTestController::setIconDatabaseEnabled);
   BindMethod("setCustomPolicyDelegate", &LayoutTestController::setCustomPolicyDelegate);
   BindMethod("waitForPolicyDelegate", &LayoutTestController::waitForPolicyDelegate);
   BindMethod("setWillSendRequestReturnsNullOnRedirect", &LayoutTestController::setWillSendRequestReturnsNullOnRedirect);
   BindMethod("whiteListAccessFromOrigin", &LayoutTestController::whiteListAccessFromOrigin);
+  BindMethod("clearAllDatabases", &LayoutTestController::clearAllDatabases);
 
   // The following are stubs.
   BindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive);
   BindMethod("setMainFrameIsFirstResponder", &LayoutTestController::setMainFrameIsFirstResponder);
   BindMethod("dumpSelectionRect", &LayoutTestController::dumpSelectionRect);
   BindMethod("display", &LayoutTestController::display);
   BindMethod("testRepaint", &LayoutTestController::testRepaint);
   BindMethod("repaintSweepHorizontally", &LayoutTestController::repaintSweepHorizontally);
   BindMethod("clearBackForwardList", &LayoutTestController::clearBackForwardList);
   BindMethod("keepWebHistory", &LayoutTestController::keepWebHistory);
@@ skipping 801 matching lines @@
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
     logging::LogMessage("CONSOLE:", 0).stream() << message;
   } else {
     printf("CONSOLE MESSAGE: %S\n", message.c_str());
   }
   result->SetNull();
 }
 
 void LayoutTestController::whiteListAccessFromOrigin(
-    const CppArgumentList& args, CppVariant* result)
-{
+    const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 
   if (args.size() != 4 || !args[0].isString() || !args[1].isString() ||
       !args[2].isString() || !args[3].isBool())
     return;
 
   WebKit::WebURL url(GURL(args[0].ToString()));
   if (!url.isValid())
     return;
 
   WebKit::whiteListAccessFromOrigin(url,
                                     WebString::fromUTF8(args[1].ToString()),
                                     WebString::fromUTF8(args[2].ToString()),
                                     args[3].ToBoolean());
 }
 
+void LayoutTestController::clearAllDatabases(
+    const CppArgumentList& args, CppVariant* result) {
+  result->SetNull();
+  SimpleDatabaseSystem::GetInstance()->ClearAllDatabases();
+}
+
 void LayoutTestController::LogErrorToConsole(const std::string& text) {
   shell_->delegate()->didAddMessageToConsole(
       WebConsoleMessage(WebConsoleMessage::LevelError,
                         WebString::fromUTF8(text)),
       WebString(), 0);
 }