summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-23 05:42:54 +0000
committerdgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-23 05:42:54 +0000
commit030552754f49bbbd51c585800457b5de00dd0cbc (patch)
treea643731727af950b49afa6732aeab217e65b4c67
parentc7fa15058776d40563cf04d4f2994d196f5da30b (diff)
downloadchromium_src-030552754f49bbbd51c585800457b5de00dd0cbc.zip
chromium_src-030552754f49bbbd51c585800457b5de00dd0cbc.tar.gz
chromium_src-030552754f49bbbd51c585800457b5de00dd0cbc.tar.bz2
Make IndexedDB brower test work with updated api
BUG=87189 TEST=lvm/Debug/browser_tests --gtest_filter=IndexedDBBrowserTest.TransactionGetTest Review URL: http://codereview.chromium.org/7240008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90166 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/data/indexeddb/transaction_get_test.js4
-rw-r--r--content/browser/in_process_webkit/indexed_db_browsertest.cc5
2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/test/data/indexeddb/transaction_get_test.js b/chrome/test/data/indexeddb/transaction_get_test.js
index 5319750..3699ce6 100644
--- a/chrome/test/data/indexeddb/transaction_get_test.js
+++ b/chrome/test/data/indexeddb/transaction_get_test.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -29,7 +29,7 @@ function gotValue()
function startTransaction()
{
debug("Using get in a transaction");
- transaction = db.transaction();
+ transaction = db.transaction('storeName');
//transaction.onabort = unexpectedErrorCallback;
store = transaction.objectStore('storeName');
shouldBeEqualToString("store.name", "storeName");
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 8e0505d..03debd0 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -85,10 +85,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
}
-// Broken because some parameters of IDB API are not optional since
-// http://trac.webkit.org/changeset/89451
-// http://crbug.com/87189
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionGetTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html"))));
}