From e16fa1ee9ba1a4f8af71de72aa396809bfe69b84 Mon Sep 17 00:00:00 2001
From: "johnnyg@chromium.org"
 <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 22 Oct 2009 18:46:33 +0000
Subject: Webkit roll 49926:49941

BUG=none
TEST=none
TBR=tc,jorlow

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29794 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../in_process_webkit/dom_storage_uitest.cc        | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'chrome/browser/in_process_webkit')

diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 935cf43..1574697 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -8,13 +8,6 @@
 #include "chrome/test/ui/ui_layout_test.h"
 
 // TODO(jorlow): Enable all of these tests, eventually...
-/*
-static const char* kTopLevelFiles[] = {
-  "window-attributes-exist.html",
-  NULL
-};
-*/
-
 static const char* kEventsFiles[] = {
   //"complex-values.html",
   //"iframe-events.html",
@@ -28,24 +21,30 @@ static const char* kEventsFiles[] = {
   NULL
 };
 
-static const char* kNoEventsFiles[] = {
+static const char* kTopLevelFiles[] = {
   "clear.html",
+  "quota.html",
+  "remove-item.html",
+  //"window-attributes-exist.html",
+  NULL
+};
+
+static const char* kNoEventsFiles[] = {
   //"complex-keys.html",
   "delete-removal.html",
   "enumerate-storage.html",
   "enumerate-with-length-and-key.html",
-  "remove-item.html",
   "simple-usage.html",
   NULL
 };
 
 static const char* kLocalStorageFiles[] = {
-  "quota.html",
+  //  "quota.html",
   NULL
 };
 
 static const char* kSessionStorageFiles[] = {
-  "no-quota.html",
+  //  "no-quota.html",
   NULL
 };
 
@@ -105,7 +104,8 @@ class DOMStorageTest : public UILayoutTest {
 
 TEST_F(DOMStorageTest, DOMStorageLayoutTests) {
   InitializeForLayoutTest(test_dir_, FilePath(), false);
-  //RunTests(kTopLevelFiles);
+  AddResources();
+  RunTests(kTopLevelFiles);
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=24145
-- 
cgit v1.1