Provide Shill IP Address to myIpAddress()

net/proxy/proxy_resolver_v8_tracing.cc

Index: net/proxy/proxy_resolver_v8_tracing.cc
diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc
index f772dc1271f943e4d28624b212c11aa64ea92917..9fc3a2e2e5cade1233cd30c05b012b529010b679 100644
--- a/net/proxy/proxy_resolver_v8_tracing.cc
+++ b/net/proxy/proxy_resolver_v8_tracing.cc
@@ -927,6 +927,17 @@ bool ProxyResolverV8Tracing::Job::GetDnsFromLocalCache(
     bool* return_value) {
   CheckIsOnWorkerThread();
 
+  if (op == MY_IP_ADDRESS || op == MY_IP_ADDRESS_EX) {

[eroman, 2014/04/21 22:54:47]

There is a difference between MY_IP_ADDRESS and MY_IP_ADDRESS_EX -- the former
is supposed to return ONLY ipv4 addresses. Whereas the latter can return IPv6
addresses. What is the IP address string that chrome os is setting?

[stevenjb, 2014/04/22 22:32:56]

Currently we only have ipv4 address available. I will add a comment and a link
to a bug tracking ipv6 support.

+    // If a system (e.g. Chrome OS) has specified an explicit IP address to
+    // use, return that.
+    std::string my_ip_address = host_resolver()->my_ip_address();

[eroman, 2014/04/21 22:54:47]

This is not correct. The HostResolver should only be operated on the IO thread,
however here it is running on a worker thread (see the assertion at the top of
this function).

You should probably be doing this as part of DoDnsOperation() or as part of the
HostResolver itself.

[stevenjb, 2014/04/22 22:32:56]

Ah, you are right. I will move this to DoDnsOperation() as you suggest. I
started doing that originally, but thought this would be simpler, not
considering the threading concerns.

+    if (!my_ip_address.empty()) {
+      *output = my_ip_address;
+      *return_value = true;
+      return true;
+    }
+  }
+
   DnsCache::const_iterator it = dns_cache_.find(MakeDnsCacheKey(host, op));
   if (it == dns_cache_.end())
     return false;