Index: chrome/test/ui/javascript_test_util.cc |
=================================================================== |
--- chrome/test/ui/javascript_test_util.cc (revision 85645) |
+++ chrome/test/ui/javascript_test_util.cc (working copy) |
@@ -6,6 +6,7 @@ |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
+#include "base/string_number_conversions.h" |
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
#include "content/common/json_value_serializer.h" |
@@ -38,17 +39,28 @@ |
if (!succeeded) |
continue; |
- EXPECT_TRUE(value->IsType(Value::TYPE_STRING)); |
- if (value->IsType(Value::TYPE_STRING)) { |
- const std::string& key(*it); |
+ const std::string& key(*it); |
+ std::string result; |
- std::string result; |
- succeeded = value->GetAsString(&result); |
- EXPECT_TRUE(succeeded); |
+ switch (value->GetType()) { |
+ case Value::TYPE_STRING: |
+ succeeded = value->GetAsString(&result); |
+ break; |
+ case Value::TYPE_DOUBLE: { |
+ double double_result; |
+ succeeded = value->GetAsDouble(&double_result); |
+ if (succeeded) |
+ result = base::DoubleToString(double_result); |
+ break; |
+ } |
+ default: |
+ NOTREACHED() << "Value type not supported!"; |
+ return false; |
+ } |
- if (succeeded) |
- results->insert(std::make_pair(key, result)); |
- } |
+ EXPECT_TRUE(succeeded); |
+ if (succeeded) |
+ results->insert(std::make_pair(key, result)); |
} |
return true; |