Removing a type alias blink::Mode since it's too generic

The blink::ParsedContentType::Mode type had an alias blink::Mode
which made that type name unavailable or caused shadowing warnings
for other code in the blink namespace. It makes sense that code
has to write ParsedContentType::Mode instead of Mode since that
will be clearer.

Change-Id: Ie20089fdde14fe0aea4b2beb6f8ab82aa955fdc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1732089Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#683416}

third_party/blink/renderer/platform/network/http_parsers.cc

@@ -281,7 +281,7 @@ ReflectedXSSDisposition ParseXSSProtectionHeader(const String& header,
   HeaderFieldTokenizer tokenizer(header);
 
   StringView toggle;
-  if (!tokenizer.ConsumeToken(Mode::kNormal, toggle)) {
+  if (!tokenizer.ConsumeToken(ParsedContentType::Mode::kNormal, toggle)) {
     if (tokenizer.IsConsumed())
       return kReflectedXSSUnset;
   }
@@ -314,7 +314,7 @@ ReflectedXSSDisposition ParseXSSProtectionHeader(const String& header,
     // At start of next directive.
     StringView token;
     unsigned token_start = tokenizer.Index();
-    if (!tokenizer.ConsumeToken(Mode::kNormal, token)) {
+    if (!tokenizer.ConsumeToken(ParsedContentType::Mode::kNormal, token)) {
       failure_reason = failure_reason_invalid_directive;
       failure_position = token_start;
       return kReflectedXSSInvalid;
@@ -333,7 +333,8 @@ ReflectedXSSDisposition ParseXSSProtectionHeader(const String& header,
       }
       String value;
       unsigned value_start = tokenizer.Index();
-      if (!tokenizer.ConsumeTokenOrQuotedString(Mode::kNormal, value) ||
+      if (!tokenizer.ConsumeTokenOrQuotedString(
+              ParsedContentType::Mode::kNormal, value) ||
           !EqualIgnoringASCIICase(value, "block")) {
         failure_reason = failure_reason_invalid_mode;
         failure_position = value_start;
@@ -356,7 +357,8 @@ ReflectedXSSDisposition ParseXSSProtectionHeader(const String& header,
       failure_position = tokenizer.Index();
       String value;
       // Relaxed mode - unquoted URLs contain colons and such.
-      if (!tokenizer.ConsumeTokenOrQuotedString(Mode::kRelaxed, value)) {
+      if (!tokenizer.ConsumeTokenOrQuotedString(
+              ParsedContentType::Mode::kRelaxed, value)) {
         failure_reason = failure_reason_invalid_report;
         return kReflectedXSSInvalid;
       }
@@ -677,7 +679,7 @@ std::unique_ptr<ServerTimingHeaderVector> ParseServerTimingHeader(
     HeaderFieldTokenizer tokenizer(headerValue);
     while (!tokenizer.IsConsumed()) {
       StringView name;
-      if (!tokenizer.ConsumeToken(Mode::kNormal, name)) {
+      if (!tokenizer.ConsumeToken(ParsedContentType::Mode::kNormal, name)) {
         break;
       }
 
@@ -685,13 +687,15 @@ std::unique_ptr<ServerTimingHeaderVector> ParseServerTimingHeader(
 
       while (tokenizer.Consume(';')) {
         StringView parameter_name;
-        if (!tokenizer.ConsumeToken(Mode::kNormal, parameter_name)) {
+        if (!tokenizer.ConsumeToken(ParsedContentType::Mode::kNormal,
+                                    parameter_name)) {
           break;
         }
 
         String value = "";
         if (tokenizer.Consume('=')) {
-          tokenizer.ConsumeTokenOrQuotedString(Mode::kNormal, value);
+          tokenizer.ConsumeTokenOrQuotedString(ParsedContentType::Mode::kNormal,
+                                               value);
           tokenizer.ConsumeBeforeAnyCharMatch({',', ';'});
         }
         header.SetParameter(parameter_name, value);

third_party/blink/renderer/platform/network/http_parsers.h

@@ -164,9 +164,6 @@ PLATFORM_EXPORT bool ParseContentRangeHeaderFor206(const String& content_range,
 
 PLATFORM_EXPORT std::unique_ptr<ServerTimingHeaderVector>
 ParseServerTimingHeader(const String&);
-
-using Mode = blink::ParsedContentType::Mode;
-
 }  // namespace blink
 
 #endif