IndexedDB: Start running worker layout tests as ui tests.

BUG=64054
TEST=


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

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

1 files changed, 22 insertions, 3 deletions

diff --git a/content/browser/in_process_webkit/indexed_db_uitest.cc b/content/browser/in_process_webkit/indexed_db_uitest.cc
index 99750c5..5c0f782 100644
--- a/content/browser/in_process_webkit/indexed_db_uitest.cc
+++ b/content/browser/in_process_webkit/indexed_db_uitest.cc
@@ -14,6 +14,14 @@
 static const char* kLayoutTestFileNames[] = {
   // TODO(dgrogan): Put the other IDB layout tests here.
   "prefetch-bugfix-108071.html",
+  "basics.html",
+//  "objectstore-basics.html", // Too big: crbug.com/33472
+//  "index-basics.html", // Too big.
+};
+
+static const char* kWorkerTestFileNames[] = {
+  "basics-workers.html",
+//  "objectstore-basics-workers.html",  // Too big.
 };
 
 class IndexedDBUILayoutTest : public UILayoutTest {
@@ -28,9 +36,12 @@ class IndexedDBUILayoutTest : public UILayoutTest {
 
   void AddJSTestResources() {
     // Add other paths our tests require.
-    FilePath js_dir = FilePath().
-                      AppendASCII("fast").AppendASCII("js");
-    AddResourceForLayoutTest(js_dir, FilePath().AppendASCII("resources"));
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("fast").AppendASCII("js"),
+        FilePath().AppendASCII("resources"));
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("fast").AppendASCII("filesystem"),
+        FilePath().AppendASCII("resources"));
   }
 
   FilePath test_dir_;
@@ -43,3 +54,11 @@ TEST_F(IndexedDBUILayoutTest, LayoutTests) {
   for (size_t i = 0; i < arraysize(kLayoutTestFileNames); ++i)
     RunLayoutTest(kLayoutTestFileNames[i], port);
 }
+
+TEST_F(IndexedDBUILayoutTest, WorkerLayoutTests) {
+  const int port = kNoHttpPort;
+  InitializeForLayoutTest(test_dir_, FilePath(), port);
+  AddJSTestResources();
+  for (size_t i = 0; i < arraysize(kWorkerTestFileNames); ++i)
+    RunLayoutTest(kWorkerTestFileNames[i], port);
+}