Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / testing / TypeConversions.h

diff --git a/src/third_party/WebKit/Source/core/testing/TypeConversions.h b/src/third_party/WebKit/Source/core/testing/TypeConversions.h
index 624e3e2..4f521ca 100644 (file)
--- a/src/third_party/WebKit/Source/core/testing/TypeConversions.h
+++ b/src/third_party/WebKit/Source/core/testing/TypeConversions.h
@@ -33,7 +33,7 @@
 
 namespace blink {
 
-class TypeConversions FINAL : public GarbageCollectedFinalized<TypeConversions>, public ScriptWrappable {
+class TypeConversions final : public GarbageCollectedFinalized<TypeConversions>, public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static TypeConversions* create()
@@ -64,8 +64,8 @@ public:
     const String& testByteString() const { return m_byteString; }
     void setTestByteString(const String& value) { m_byteString = value; }
 
-    const String& testScalarValueString() const { return m_scalarValueString; }
-    void setTestScalarValueString(const String& value) { m_scalarValueString = value; }
+    const String& testUSVString() const { return m_usvString; }
+    void setTestUSVString(const String& value) { m_usvString = value; }
 
     void trace(Visitor*) { }
 
@@ -90,7 +90,7 @@ private:
     int16_t m_short;
     uint16_t m_unsignedShort;
     String m_byteString;
-    String m_scalarValueString;
+    String m_usvString;
 };
 
 } // namespace blink