Convert plain C-style casts to use CFCastStrict and GetValueFromDictionary template

net/proxy/proxy_server_mac.cc

Index: net/proxy/proxy_server_mac.cc
diff --git a/net/proxy/proxy_server_mac.cc b/net/proxy/proxy_server_mac.cc
index 4df37a47b0b1a1b43e10056c1a78b58585fa6781..eebde544b8c31b8b5f09832041fbb44590dd4fec 100644
--- a/net/proxy/proxy_server_mac.cc
+++ b/net/proxy/proxy_server_mac.cc
@@ -24,9 +24,8 @@ ProxyServer ProxyServer::FromDictionary(Scheme scheme,
     return ProxyServer(scheme, HostPortPair());
   }
 
-  CFStringRef host_ref =
-      (CFStringRef)base::mac::GetValueFromDictionary(dict, host_key,
-                                                    CFStringGetTypeID());
+  CFStringRef host_ref = base::mac::GetValueFromDictionary<CFStringRef>(

[Mark Mentovai, 2011/11/15 19:18:21]

Don’t you think that this would be more readable in the same style that the
existing code used?

  CFStringRef host_ref =
      base::mac::GetValueFromDictionary<CFStringRef>(dict, host_key);

Same on lines 37-38.

[KushalP, 2011/11/15 19:25:59]

I do, but doing so would mean both lines end up being 83 characters long and
fail the presubmit checks.

So I went for what seemed natural off the style guide:
http://www.chromium.org/developers/coding-style#TOC-Code-formatting (the line in
green starting with "bool result =")

[Mark Mentovai, 2011/11/15 19:40:56]

KushalP wrote:
The example I gave you, quoted above and reproduced here:

  CFStringRef host_ref =
      base::mac::GetValueFromDictionary<CFStringRef>(dict, host_key);

is only 69 columns wide.

You’re still using two lines, you’re just putting the break in a place that
makes the code read more naturally.

In fact, what I’m suggesting is exactly the same as the advice given by the
Chromium style guide in the section you referenced.

[KushalP, 2011/11/15 19:57:25]

Fixed now. Should I also add an extra newline at lines 29 and 38 now?

It doesn't look like a new 'paragraph' but it does read cleaner around the if
statement. It worked previously as the final param was pushed to the far-right
making it look like a new line.

+      dict, host_key);
   if (!host_ref) {
     LOG(WARNING) << "Could not find expected key "
                  << base::SysCFStringRefToUTF8(host_key)
@@ -35,9 +34,8 @@ ProxyServer ProxyServer::FromDictionary(Scheme scheme,
   }
   std::string host = base::SysCFStringRefToUTF8(host_ref);
 
-  CFNumberRef port_ref =
-      (CFNumberRef)base::mac::GetValueFromDictionary(dict, port_key,
-                                                    CFNumberGetTypeID());
+  CFNumberRef port_ref = base::mac::GetValueFromDictionary<CFNumberRef>(

[Mark Mentovai, 2011/11/15 19:40:56]

  CFNumberRef port_ref =
      base::mac::GetValueFromDictionary<CFNumberRef>(dict, port_key);

would also be 69 columns on two lines.

+      dict, port_key);
   int port;
   if (port_ref) {
     CFNumberGetValue(port_ref, kCFNumberIntType, &port);