MediaQueryEvaluator getting mediaType from MediaValues

Source/core/css/parser/SizesCalcParserTest.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/parser/SizesCalcParser.h"
 
+#include "core/MediaTypeNames.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/parser/MediaQueryTokenizer.h"
 
 #include <gtest/gtest.h>
 
 namespace WebCore {
 
 struct TestCase {
@@ skipping 85 matching lines @@
     data.viewportWidth = 500;
     data.viewportHeight = 643;
     data.deviceWidth = 500;
     data.deviceHeight = 643;
     data.devicePixelRatio = 2.0;
     data.colorBitsPerComponent = 24;
     data.monochromeBitsPerComponent = 0;
     data.pointer = MediaValues::MousePointer;
     data.defaultFontSize = 16;
     data.threeDEnabled = true;
-    data.scanMediaType = false;
-    data.screenMediaType = true;
-    data.printMediaType = false;
+    data.mediaType = MediaTypeNames::screen;
     data.strictMode = true;
     RefPtr<MediaValues> mediaValues = MediaValuesCached::create(data);
 
     for (unsigned i = 0; testCases[i].input; ++i) {
         Vector<MediaQueryToken> tokens;
         MediaQueryTokenizer::tokenize(testCases[i].input, tokens);
         unsigned output;
         bool valid = SizesCalcParser::parse(tokens.begin(), tokens.end(), mediaValues, output);
         ASSERT_EQ(testCases[i].valid, valid);
         if (valid)
             ASSERT_EQ(testCases[i].output, output);
     }
 
     for (unsigned i = 0; testCases[i].input; ++i) {
         if (testCases[i].dontRunInCSSCalc)
             continue;
         verifyCSSCalc(testCases[i].input, testCases[i].output, testCases[i].valid, data.defaultFontSize, data.viewportWidth, data.viewportHeight);
     }
 }
 
 } // namespace