Merge 280230 "Flag myIpAddress requests for chromeos"

net/dns/host_resolver.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DNS_HOST_RESOLVER_H_
 #define NET_DNS_HOST_RESOLVER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 70 matching lines @@
     void set_host_resolver_flags(HostResolverFlags host_resolver_flags) {
       host_resolver_flags_ = host_resolver_flags;
     }
 
     bool allow_cached_response() const { return allow_cached_response_; }
     void set_allow_cached_response(bool b) { allow_cached_response_ = b; }
 
     bool is_speculative() const { return is_speculative_; }
     void set_is_speculative(bool b) { is_speculative_ = b; }
 
+    bool is_my_ip_address() const { return is_my_ip_address_; }
+    void set_is_my_ip_address(bool b) { is_my_ip_address_ = b; }
+
    private:
     // The hostname to resolve, and the port to use in resulting sockaddrs.
     HostPortPair host_port_pair_;
 
     // The address family to restrict results to.
     AddressFamily address_family_;
 
     // Flags to use when resolving this request.
     HostResolverFlags host_resolver_flags_;
 
     // Whether it is ok to return a result from the host cache.
     bool allow_cached_response_;
 
     // Whether this request was started by the DNS prefetcher.
     bool is_speculative_;
+
+    // Indicates a request for myIpAddress (to differentiate from other requests
+    // for localhost, currently used by Chrome OS).
+    bool is_my_ip_address_;
   };
 
   // Opaque type used to cancel a request.
   typedef void* RequestHandle;
 
   // Set Options.max_concurrent_resolves to this to select a default level
   // of concurrency.
   static const size_t kDefaultParallelism = 0;
 
   // Set Options.max_retry_attempts to this to select a default retry value.
@@ skipping 75 matching lines @@
  protected:
   HostResolver();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HostResolver);
 };
 
 }  // namespace net
 
 #endif  // NET_DNS_HOST_RESOLVER_H_