X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Ftesting%2FTypeConversions.h;h=4f521cabbbe05c6deeb074c97aafec4cb7a727ea;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=624e3e2493434d2d73d89386aeed5ccb03766b84;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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