Change mojo enums to be scoped enums in the generated C++ bindings.

net/proxy/mojo_proxy_type_converters.cc

Index: net/proxy/mojo_proxy_type_converters.cc
diff --git a/net/proxy/mojo_proxy_type_converters.cc b/net/proxy/mojo_proxy_type_converters.cc
index c927534d10b6976763bf38d2f2bf4082adc87f49..2da740fa79e6afdcb5e7f406bc3e65627dbb0b01 100644
--- a/net/proxy/mojo_proxy_type_converters.cc
+++ b/net/proxy/mojo_proxy_type_converters.cc
@@ -15,39 +15,39 @@ namespace {
 interfaces::ProxyScheme ProxySchemeToMojo(ProxyServer::Scheme scheme) {
   switch (scheme) {
     case ProxyServer::SCHEME_INVALID:
-      return interfaces::PROXY_SCHEME_INVALID;
+      return interfaces::ProxyScheme::INVALID;
     case ProxyServer::SCHEME_DIRECT:
-      return interfaces::PROXY_SCHEME_DIRECT;
+      return interfaces::ProxyScheme::DIRECT;
     case ProxyServer::SCHEME_HTTP:
-      return interfaces::PROXY_SCHEME_HTTP;
+      return interfaces::ProxyScheme::HTTP;
     case ProxyServer::SCHEME_SOCKS4:
-      return interfaces::PROXY_SCHEME_SOCKS4;
+      return interfaces::ProxyScheme::SOCKS4;
     case ProxyServer::SCHEME_SOCKS5:
-      return interfaces::PROXY_SCHEME_SOCKS5;
+      return interfaces::ProxyScheme::SOCKS5;
     case ProxyServer::SCHEME_HTTPS:
-      return interfaces::PROXY_SCHEME_HTTPS;
+      return interfaces::ProxyScheme::HTTPS;
     case ProxyServer::SCHEME_QUIC:
-      return interfaces::PROXY_SCHEME_QUIC;
+      return interfaces::ProxyScheme::QUIC;
   }
   NOTREACHED();
-  return interfaces::PROXY_SCHEME_INVALID;
+  return interfaces::ProxyScheme::INVALID;
 }
 
 ProxyServer::Scheme ProxySchemeFromMojo(interfaces::ProxyScheme scheme) {
   switch (scheme) {
-    case interfaces::PROXY_SCHEME_INVALID:
+    case interfaces::ProxyScheme::INVALID:
       return ProxyServer::SCHEME_INVALID;
-    case interfaces::PROXY_SCHEME_DIRECT:
+    case interfaces::ProxyScheme::DIRECT:
       return ProxyServer::SCHEME_DIRECT;
-    case interfaces::PROXY_SCHEME_HTTP:
+    case interfaces::ProxyScheme::HTTP:
       return ProxyServer::SCHEME_HTTP;
-    case interfaces::PROXY_SCHEME_SOCKS4:
+    case interfaces::ProxyScheme::SOCKS4:
       return ProxyServer::SCHEME_SOCKS4;
-    case interfaces::PROXY_SCHEME_SOCKS5:
+    case interfaces::ProxyScheme::SOCKS5:
       return ProxyServer::SCHEME_SOCKS5;
-    case interfaces::PROXY_SCHEME_HTTPS:
+    case interfaces::ProxyScheme::HTTPS:
       return ProxyServer::SCHEME_HTTPS;
-    case interfaces::PROXY_SCHEME_QUIC:
+    case interfaces::ProxyScheme::QUIC:
       return ProxyServer::SCHEME_QUIC;
   }
   NOTREACHED();
@@ -65,8 +65,8 @@ TypeConverter<net::interfaces::ProxyServerPtr, net::ProxyServer>::Convert(
     const net::ProxyServer& obj) {
   net::interfaces::ProxyServerPtr server(net::interfaces::ProxyServer::New());
   server->scheme = net::ProxySchemeToMojo(obj.scheme());
-  if (server->scheme != net::interfaces::PROXY_SCHEME_DIRECT &&
-      server->scheme != net::interfaces::PROXY_SCHEME_INVALID) {
+  if (server->scheme != net::interfaces::ProxyScheme::DIRECT &&
+      server->scheme != net::interfaces::ProxyScheme::INVALID) {
     server->host = obj.host_port_pair().host();
     server->port = obj.host_port_pair().port();
   }