Cleanup dart to string conversions.

Source/WebCore/bindings/dart/DartUtilities.cpp

Index: Source/WebCore/bindings/dart/DartUtilities.cpp
diff --git a/Source/WebCore/bindings/dart/DartUtilities.cpp b/Source/WebCore/bindings/dart/DartUtilities.cpp
index 95c4de4c0f92cc673335fca1194175ce7b4c9d87..fd9963ed5655ebd1a8c207ac91a20c913c6b9cfd 100644
--- a/Source/WebCore/bindings/dart/DartUtilities.cpp
+++ b/Source/WebCore/bindings/dart/DartUtilities.cpp
@@ -54,11 +54,8 @@ namespace WebCore {
 
 const char* DartUtilities::htmlLibraryName = "dart:html";
 
-PassRefPtr<StringImpl> DartUtilities::toStringImpl(Dart_Handle object, ConversionFlag flag, Dart_Handle& exception)
+PassRefPtr<StringImpl> DartUtilities::toStringImpl(Dart_Handle object, Dart_Handle& exception)
 {
-    if (flag == ConvertNullToDefaultValue && Dart_IsNull(object))
-        return 0;
-
     if (!Dart_IsString(object)) {
         exception = Dart_NewString("String expected");
         return 0;
@@ -135,6 +132,14 @@ int64_t DartUtilities::toInteger(Dart_Handle object, Dart_Handle& exception)
     return convert<IntegerTrait>(object, exception);
 }
 
+String DartUtilities::toString(Dart_Handle object)
+{
+    Dart_Handle exception = 0;
+    String string = dartToString(object, exception);
+    ASSERT(!exception);
+    return string;
+}
+
 struct DoubleTrait {
     typedef double nativeType;
     static Dart_Handle convert(Dart_Handle object, double* value)
@@ -376,7 +381,7 @@ PassRefPtr<WebKitFlags> DartUtilities::toWebKitFlags(Dart_Handle object, Dart_Ha
         return 0;
     RefPtr<WebKitFlags> flags = WebKitFlags::create();
     for (size_t i = 0; i < keys.size(); ++i) {
-        String key = DartUtilities::toStringImpl(keys[i], ConvertNone, exception);
+        String key = DartUtilities::dartToString(keys[i], exception);
         if (exception)
             return 0;
 
@@ -553,7 +558,7 @@ void DartUtilities::reportProblem(ScriptExecutionContext* context, Dart_Handle r
         if (Dart_IsError(exception))
             errorMessage = String("Error converting exception to a string: ") + Dart_GetError(exception);
         else
-            errorMessage = String("Exception: ") + DartUtilities::dartStringToString(exception);
+            errorMessage = String("Exception: ") + DartUtilities::toString(exception);
 
         // FIXME: Fill in the callStack, sourceFile, and lineNumber
         // and remove the below once the Dart APIs to iterate over the
@@ -567,7 +572,7 @@ void DartUtilities::reportProblem(ScriptExecutionContext* context, Dart_Handle r
         if (Dart_IsError(stacktrace))
             errorMessage += String("\nError converting stack trace to a string: ") + Dart_GetError(stacktrace);
         else
-            errorMessage += String("\nStack Trace: ") + DartUtilities::dartStringToString(stacktrace);
+            errorMessage += String("\nStack Trace: ") + DartUtilities::toString(stacktrace);
     }
 
     if (context && context->isDocument())