Cleanup dart to string conversions.

Source/WebCore/bindings/dart/custom/DartDOMStringMapCustom.cpp

Index: Source/WebCore/bindings/dart/custom/DartDOMStringMapCustom.cpp
diff --git a/Source/WebCore/bindings/dart/custom/DartDOMStringMapCustom.cpp b/Source/WebCore/bindings/dart/custom/DartDOMStringMapCustom.cpp
index 292bf2a2bca4367654a74ea3a202404a8cd28ae8..76ffcab3125fbcbe10bbb74cc65db96ab414a49d 100644
--- a/Source/WebCore/bindings/dart/custom/DartDOMStringMapCustom.cpp
+++ b/Source/WebCore/bindings/dart/custom/DartDOMStringMapCustom.cpp
@@ -16,11 +16,9 @@ static void containsKeyCallback(Dart_NativeArguments args)
     {
         DOMStringMap* receiver = DartDOMWrapper::receiver<DOMStringMap>(args);
 
-        ParameterAdapter<String> key(Dart_GetNativeArgument(args, 1));
-        if (!key.conversionSuccessful()) {
-            exception = key.exception();
+        DartStringAdapter key = DartUtilities::dartToString(Dart_GetNativeArgument(args, 1), exception);
+        if (exception)
             goto fail;
-        }
 
         Dart_SetReturnValue(args, DartUtilities::boolToDart(receiver->contains(key)));
         return;
@@ -38,11 +36,9 @@ static void itemCallback(Dart_NativeArguments args)
     {
         DOMStringMap* receiver = DartDOMWrapper::receiver<DOMStringMap>(args);
 
-        ParameterAdapter<String> key(Dart_GetNativeArgument(args, 1));
-        if (!key.conversionSuccessful()) {
-            exception = key.exception();
+        DartStringAdapter key = DartUtilities::dartToString(Dart_GetNativeArgument(args, 1), exception);
+        if (exception)
             goto fail;
-        }
 
         Dart_SetReturnValue(args, DartUtilities::stringToDart(receiver->item(key)));
         return;
@@ -60,17 +56,13 @@ static void setItemCallback(Dart_NativeArguments args)
     {
         DOMStringMap* receiver = DartDOMWrapper::receiver<DOMStringMap>(args);
 
-        ParameterAdapter<String> key(Dart_GetNativeArgument(args, 1));
-        if (!key.conversionSuccessful()) {
-            exception = key.exception();
+        DartStringAdapter key = DartUtilities::dartToString(Dart_GetNativeArgument(args, 1), exception);
+        if (exception)
             goto fail;
-        }
 
-        ParameterAdapter<String> value(Dart_GetNativeArgument(args, 2));
-        if (!value.conversionSuccessful()) {
-            exception = value.exception();
+        DartStringAdapter value = DartUtilities::dartToString(Dart_GetNativeArgument(args, 2), exception);
+        if (exception)
             goto fail;
-        }
 
         ExceptionCode ec = 0;
         receiver->setItem(key, value, ec);
@@ -94,11 +86,9 @@ static void removeCallback(Dart_NativeArguments args)
     {
         DOMStringMap* receiver = DartDOMWrapper::receiver<DOMStringMap>(args);
 
-        ParameterAdapter<String> key(Dart_GetNativeArgument(args, 1));
-        if (!key.conversionSuccessful()) {
-            exception = key.exception();
+        DartStringAdapter key = DartUtilities::dartToString(Dart_GetNativeArgument(args, 1), exception);
+        if (exception)
             goto fail;
-        }
 
         String value = receiver->item(key);
 
@@ -148,7 +138,7 @@ fail:
 
 Dart_NativeFunction DartDOMStringMap::resolver(Dart_Handle nameHandle, int argumentCount)
 {
-    String name = DartUtilities::dartStringToString(nameHandle);
+    String name = DartUtilities::toString(nameHandle);
 
     if (argumentCount == 2 && name == "DOMStringMap_containsKey_Callback")
         return DartDOMStringMapInternal::containsKeyCallback;