Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)

1 files changed, 4 insertions, 8 deletions

diff --git a/Source/WebKit/chromium/tests/IDBBindingUtilitiesTest.cpp b/Source/WebKit/chromium/tests/IDBBindingUtilitiesTest.cpp
index d60295a5f..c1351850d 100644
--- a/Source/WebKit/chromium/tests/IDBBindingUtilitiesTest.cpp
+++ b/Source/WebKit/chromium/tests/IDBBindingUtilitiesTest.cpp
@@ -41,10 +41,8 @@ namespace {
 
 PassRefPtr<IDBKey> checkKeyFromValueAndKeyPathInternal(SerializedScriptValue* value, const String& keyPath)
 {
-    Vector<String> idbKeyPath;
-    IDBKeyPathParseError parseError;
-    IDBParseKeyPath(keyPath, idbKeyPath, parseError);
-    EXPECT_EQ(IDBKeyPathParseErrorNone, parseError);
+    IDBKeyPath idbKeyPath(keyPath);
+    EXPECT_TRUE(idbKeyPath.isValid());
     return createIDBKeyFromSerializedValueAndKeyPath(value, idbKeyPath);
 }
 
@@ -56,10 +54,8 @@ void checkKeyPathNullValue(SerializedScriptValue* value, const String& keyPath)
 
 PassRefPtr<SerializedScriptValue> injectKey(PassRefPtr<IDBKey> key, PassRefPtr<SerializedScriptValue> value, const String& keyPath)
 {
-    Vector<String> idbKeyPath;
-    IDBKeyPathParseError parseError;
-    IDBParseKeyPath(keyPath, idbKeyPath, parseError);
-    EXPECT_EQ(IDBKeyPathParseErrorNone, parseError);
+    IDBKeyPath idbKeyPath(keyPath);
+    EXPECT_TRUE(idbKeyPath.isValid());
     return injectIDBKeyIntoSerializedValue(key, value, idbKeyPath);
 }