[Typed-OM] Add compound type of CSSVariableReferenceValue and String with some tests

third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValueTest.cpp

Index: third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValueTest.cpp
diff --git a/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValueTest.cpp b/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValueTest.cpp
index b1e81a20b4223f9c25722993cbf711365ba65a72..5d50eff1de194b7cafa6db06bb81032c42fd10c5 100644
--- a/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValueTest.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValueTest.cpp
@@ -11,23 +11,32 @@ namespace blink {
 
 namespace {
 
-CSSTokenStreamValue* tokenStreamValueFromString(String str)
+StringOrCSSVariableReferenceValue getStringOrCSSVariableReferenceValue(String str)
 {
-    HeapVector<StringOrCSSVariableReferenceValue> listOfStrings;
-
     StringOrCSSVariableReferenceValue temp;
     temp.setString(str);
-    listOfStrings.append(tmp);
+    return temp;
+}
+
+StringOrCSSVariableReferenceValue getStringOrCSSVariableReferenceValue(CSSStyleVariableReferenceValue* ref)
+{
+    StringOrCSSVariableReferenceValue temp;
+    temp.setCSSVariableReferenceValue(ref);
+    return temp;
+}
 
+CSSTokenStreamValue* tokenStreamValueFromString(String str)
+{
+    HeapVector<StringOrCSSVariableReferenceValue> listOfStrings;
+    listOfStrings.append(getStringOrCSSVariableReferenceValue(str));
     return CSSTokenStreamValue::create(listOfStrings);
 }
 
-CSSTokenStreamValue* tokenStreamValueFromCSSVariableReferenceValue()
+CSSTokenStreamValue* tokenStreamValueFromCSSVariableReferenceValue(CSSStyleVariableReferenceValue* ref)
 {
     HeapVector<StringOrCSSVariableReferenceValue> listOfReferences;
-
-    StringOrCSSVariableReferenceValue temp;
-    temp.setCSSVariableReferenceValue(CSSStyleVariableReferenceValue::create("Ref", tokenStreamValueFromString("Str")));
+    listOfReferences.append(getStringOrCSSVariableReferenceValue(ref));
+    return CSSTokenStreamValue::create(listOfReferences);
 }
 
 TEST(CSSTokenStreamValueTest, EmptyList)
@@ -41,13 +50,7 @@ TEST(CSSTokenStreamValueTest, EmptyList)
 
 TEST(CSSTokenStreamValueTest, ListOfString)
 {
-    HeapVector<StringOrCSSVariableReferenceValue> listOfReferences;
-
-    StringOrCSSVariableReferenceValue temp;
-    temp.setString("str");
-    listOfReferences.append(temp);
-
-    CSSTokenStreamValue* tokenStreamValue = CSSTokenStreamValue::create(listOfReferences);
+    CSSTokenStreamValue* tokenStreamValue = tokenStreamValueFromString("Str");
 
     EXPECT_EQ(tokenStreamValue->size(), 1UL);
 
@@ -55,25 +58,14 @@ TEST(CSSTokenStreamValueTest, ListOfString)
     EXPECT_FALSE(tokenStreamValue->referenceAtIndex(0).isNull());
     EXPECT_FALSE(tokenStreamValue->referenceAtIndex(0).isCSSVariableReferenceValue());
 
-    EXPECT_EQ(tokenStreamValue->referenceAtIndex(0).getAsString(), "str");
+    EXPECT_EQ(tokenStreamValue->referenceAtIndex(0).getAsString(), "Str");
 }
 
 TEST(CSSTokenStreamValueTest, ListOfCSSVariableReferenceValue)
 {
-    HeapVector<StringOrCSSVariableReferenceValue> listOfStrings;
-
-    StringOrCSSVariableReferenceValue tempString;
-    tempString.setString("str");
-    listOfReferences.append(tempString);
-
-    CSSTokenStreamValue* tokenStreamValueString = CSSTokenStreamValue::create(listOfStrings);
-
-    StringOrCSSVariableReferenceValue temp;
-    CSSStyleVariableReferenceValue* ref = CSSStyleVariableReferenceValue::create("Ref", tokenStreamValueString);
-    temp.setCSSVariableReferenceValue(ref);
-    listOfReferences.append(temp);
+    CSSStyleVariableReferenceValue* ref = CSSStyleVariableReferenceValue::create("Ref");
 
-    CSSTokenStreamValue* tokenStreamValue = CSSTokenStreamValue::create(listOfReferences);
+    CSSTokenStreamValue* tokenStreamValue = tokenStreamValueFromCSSVariableReferenceValue(ref);
 
     EXPECT_EQ(tokenStreamValue->size(), 1UL);
 
@@ -88,16 +80,15 @@ TEST(CSSTokenStreamValueTest, MixedContents)
 {
     HeapVector<StringOrCSSVariableReferenceValue> listOfReferences;
 
-    StringOrCSSVariableReferenceValue x;
-    x.setString("1234");
-    listOfReferences.append(x);
+    StringOrCSSVariableReferenceValue x = getStringOrCSSVariableReferenceValue("Str");
 
-    StringOrCSSVariableReferenceValue y;
     CSSStyleVariableReferenceValue* ref = CSSStyleVariableReferenceValue::create("Ref");
-    y.setCSSVariableReferenceValue(ref);
-    listOfReferences.append(y);
+    StringOrCSSVariableReferenceValue y = getStringOrCSSVariableReferenceValue(ref);
 
     StringOrCSSVariableReferenceValue z;
+
+    listOfReferences.append(x);
+    listOfReferences.append(y);
     listOfReferences.append(z);
 
     CSSTokenStreamValue* tokenStreamValue = CSSTokenStreamValue::create(listOfReferences);
@@ -106,7 +97,7 @@ TEST(CSSTokenStreamValueTest, MixedContents)
 
     EXPECT_TRUE(tokenStreamValue->referenceAtIndex(0).isString());
     EXPECT_FALSE(tokenStreamValue->referenceAtIndex(0).isCSSVariableReferenceValue());
-    EXPECT_EQ(tokenStreamValue->referenceAtIndex(0).getAsString(), "1234");
+    EXPECT_EQ(tokenStreamValue->referenceAtIndex(0).getAsString(), "Str");
 
     EXPECT_TRUE(tokenStreamValue->referenceAtIndex(1).isCSSVariableReferenceValue());
     EXPECT_FALSE(tokenStreamValue->referenceAtIndex(1).isString());