Index: third_party/WebKit/Source/platform/inspector_protocol/Array.h |
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/Array.h b/third_party/WebKit/Source/platform/inspector_protocol/Array.h |
index 720182258b953366ca8ef8fc62342debc380733b..f3827b1c000d9c639e90eea8bfcdb646b0d6b1a9 100644 |
--- a/third_party/WebKit/Source/platform/inspector_protocol/Array.h |
+++ b/third_party/WebKit/Source/platform/inspector_protocol/Array.h |
@@ -34,7 +34,7 @@ public: |
std::unique_ptr<Array<T>> result(new Array<T>()); |
errors->push(); |
for (size_t i = 0; i < array->size(); ++i) { |
- errors->setName(String16::fromInteger(i)); |
+ errors->setName(string16FromInteger(i)); |
std::unique_ptr<T> item = ValueConversions<T>::parse(array->at(i), errors); |
result->m_vector.push_back(std::move(item)); |
} |
@@ -89,7 +89,7 @@ public: |
errors->push(); |
std::unique_ptr<Array<T>> result(new Array<T>()); |
for (size_t i = 0; i < array->size(); ++i) { |
- errors->setName(String16::fromInteger(i)); |
+ errors->setName(string16FromInteger(i)); |
T item = ValueConversions<T>::parse(array->at(i), errors); |
result->m_vector.push_back(item); |
} |
@@ -126,7 +126,7 @@ private: |
std::vector<T> m_vector; |
}; |
-template<> class Array<String> : public ArrayBase<String> {}; |
+template<> class Array<InspectorProtocolConvenienceStringType> : public ArrayBase<InspectorProtocolConvenienceStringType> {}; |
template<> class Array<String16> : public ArrayBase<String16> {}; |
template<> class Array<int> : public ArrayBase<int> {}; |
template<> class Array<double> : public ArrayBase<double> {}; |