Revert "A sizes attribute parser" (https://codereview.chromium.org/224733011)

Source/core/css/MediaQueryEvaluatorTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/MediaQueryEvaluator.h"
 
 #include "core/css/MediaList.h"
-#include "core/css/MediaValuesCached.h"
+#include "core/css/MediaValues.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/text/StringBuilder.h"
 
 #include <gtest/gtest.h>
 
 namespace WebCore {
 
 typedef struct {
     const char* input;
     const bool output;
 } TestCase;
 
 TEST(MediaQueryEvaluatorTest, Basic)
 {
     // The first string represents the input string.
     // The second string represents the output string, if present.
     // Otherwise, the output string is identical to the first string.
     TestCase screenTestCases[] = {
-        {"", 1},
-        {" ", 1},
         {"screen", 1},
         {"screen and (color)", 1},
         {"all and (min-width: 500px)", 1},
         {"not screen and (color)", 0},
         {"(min-width: 500px)", 1},
         {"(min-width: 501px)", 0},
         {"(max-width: 500px)", 1},
         {"(max-width: 499px)", 0},
         {"(width: 500px)", 1},
         {"(width: 501px)", 0},
@@ skipping 23 matching lines @@
         {"(hover: 1)", 1},
         {"(hover: 0)", 0},
         {0, 0} // Do not remove the terminator line.
     };
     TestCase printTestCases[] = {
         {"print and (min-resolution: 1dppx)", 1},
         {"print and (min-resolution: 118dpcm)", 0},
         {0, 0} // Do not remove the terminator line.
     };
 
-    MediaValuesCached::MediaValuesCachedData data;
-    data.viewportWidth = 500;
-    data.viewportHeight = 500;
-    data.deviceWidth = 500;
-    data.deviceHeight = 500;
-    data.devicePixelRatio = 2.0;
-    data.colorBitsPerComponent = 24;
-    data.monochromeBitsPerComponent = 0;
-    data.pointer = MediaValues::MousePointer;
-    data.defaultFontSize = 16;
-    data.computedFontSize = 16;
-    data.hasXHeight = true;
-    data.xHeight = 16;
-    data.zeroWidth = 16;
-    data.threeDEnabled = true;
-    data.scanMediaType = false;
-    data.screenMediaType = true;
-    data.printMediaType = false;
-    data.strictMode = true;
-    RefPtr<MediaValues> mediaValues = MediaValuesCached::create(data);
+    RefPtr<MediaValues> mediaValues = MediaValues::create(MediaValues::CachingMode,
+        500, // Viewport Width
+        500, // Viewport height
+        500, // Device Width
+        500, // Device Height
+        2.0, // Device pixel ratio
+        24, // Color bits per component
+        0, // Monochrome bits per component
+        MediaValues::MousePointer, // Pointer device
+        16, // Default font size
+        true, // 3D enabled
+        false, // scan media type
+        true, // screen media type
+        false, // print media type
+        true // Strict mode
+        );
 
     for (unsigned i = 0; screenTestCases[i].input; ++i) {
         RefPtrWillBeRawPtr<MediaQuerySet> querySet = MediaQuerySet::create(screenTestCases[i].input);
         MediaQueryEvaluator mediaQueryEvaluator("screen", *mediaValues);
         ASSERT_EQ(screenTestCases[i].output, mediaQueryEvaluator.eval(querySet.get()));
     }
     for (unsigned i = 0; printTestCases[i].input; ++i) {
         RefPtrWillBeRawPtr<MediaQuerySet> querySet = MediaQuerySet::create(printTestCases[i].input);
         MediaQueryEvaluator mediaQueryEvaluator("print", *mediaValues);
         ASSERT_EQ(printTestCases[i].output, mediaQueryEvaluator.eval(querySet.get()));
     }
 }
 
 } // namespace