Fix test shell for events. Also remove tests that no longer fail.

TBR=michaeln
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/256047

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

2 files changed, 17 insertions, 5 deletions

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index d17c220..8c51848 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -639,18 +639,13 @@ BUG21118 WIN LINUX : LayoutTests/fast/forms/box-shadow-override.html = FAIL
 BUG849072 SKIP : chrome/http/mime = PASS
 
 // These tests all depend on DOM Storage events which are not yet supported.
-BUG4360 : LayoutTests/storage/domstorage/window-attributes-exist.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/localstorage/iframe-events.html = TIMEOUT
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/iframe-events.html = TIMEOUT
 BUG4360 : LayoutTests/storage/domstorage/localstorage/simple-events.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/simple-events.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/index-get-and-set.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/index-get-and-set.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-markup.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-markup.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setattribute.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-setattribute.html = FAIL
-BUG4360 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setwindow.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/onstorage-attribute-setwindow.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/localstorage/string-conversion.html = FAIL
 BUG4360 : LayoutTests/storage/domstorage/sessionstorage/string-conversion.html = FAIL
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index de5b26f..a2b20a6 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -14,6 +14,7 @@
 #include "webkit/api/public/WebData.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebStorageArea.h"
+#include "webkit/api/public/WebStorageEventDispatcher.h"
 #include "webkit/api/public/WebStorageNamespace.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
@@ -190,6 +191,21 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
     return WebKit::WebStorageNamespace::createSessionStorageNamespace();
   }
 
+  void dispatchStorageEvent(const WebKit::WebString& key,
+      const WebKit::WebString& old_value, const WebKit::WebString& new_value,
+      const WebKit::WebString& origin, bool is_local_storage) {
+    // TODO(jorlow): Implement
+    if (!is_local_storage)
+      return;
+
+    if (!dom_storage_event_dispatcher_.get()) {
+      dom_storage_event_dispatcher_.reset(
+          WebKit::WebStorageEventDispatcher::create());
+    }
+    dom_storage_event_dispatcher_->dispatchStorageEvent(key, old_value,
+        new_value, origin, is_local_storage);
+  }
+
   virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(
         WebKit::WebApplicationCacheHostClient* client) {
     return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
@@ -212,6 +228,7 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
   ScopedTempDir appcache_dir_;
   SimpleAppCacheSystem appcache_system_;
   SimpleDatabaseSystem database_system_;
+  scoped_ptr<WebKit::WebStorageEventDispatcher> dom_storage_event_dispatcher_;
 
 #if defined(OS_WIN)
   WebKit::WebThemeEngine* active_theme_engine_;