blink: Rename enums and functions to not collide with chromium style.

third_party/WebKit/Source/core/css/MediaQuery.cpp

Index: third_party/WebKit/Source/core/css/MediaQuery.cpp
diff --git a/third_party/WebKit/Source/core/css/MediaQuery.cpp b/third_party/WebKit/Source/core/css/MediaQuery.cpp
index faa0e2022418e934ba5b36bcc2d50b1e77fb750e..07552afa07eb5357e7ff706c7fa646ceb89bc9fa 100644
--- a/third_party/WebKit/Source/core/css/MediaQuery.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQuery.cpp
@@ -79,13 +79,13 @@ PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::createNotAll()
     return adoptPtrWillBeNoop(new MediaQuery(MediaQuery::Not, MediaTypeNames::all, ExpressionHeapVector()));
 }
 
-PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::create(Restrictor restrictor, String mediaType, ExpressionHeapVector expressions)
+PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::create(RestrictorType restrictor, String mediaType, ExpressionHeapVector expressions)
 {
     return adoptPtrWillBeNoop(new MediaQuery(restrictor, std::move(mediaType), std::move(expressions)));
 }
 
-MediaQuery::MediaQuery(Restrictor r, String mediaType, ExpressionHeapVector expressions)
-    : m_restrictor(r)
+MediaQuery::MediaQuery(RestrictorType restrictor, String mediaType, ExpressionHeapVector expressions)
+    : m_restrictor(restrictor)
     , m_mediaType(attemptStaticStringCreation(mediaType.lower()))
     , m_expressions(std::move(expressions))
 {