Merge: Some services can have no IP resolved

chrome/browser/local_discovery/service_discovery_client_mac.mm

 // Copyright 2013 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.
 
 #include "chrome/browser/local_discovery/service_discovery_client_mac.h"
 
 #import <arpa/inet.h>
 #import <Foundation/Foundation.h>
 #import <net/if_dl.h>
 
@@ skipping 339 matching lines @@
     const sockaddr* socket = static_cast<const sockaddr*>(bytes);
     net::IPEndPoint end_point;
     if (end_point.FromSockAddr(socket, length)) {
       service_description_.address =
           net::HostPortPair::FromIPEndPoint(end_point);
       break;
     }
   }
 
   if (service_description_.address.host().empty()) {
-    NOTREACHED() << service_name_;
-    // Unexpected, but could be a reason for crbug.com/513505
-    base::debug::DumpWithoutCrashing();
+    VLOG(1) << "Service IP is not resolved: " << service_name_;
     callback_runner_->PostTask(
         FROM_HERE,
         base::Bind(callback_, STATUS_KNOWN_NONEXISTENT, ServiceDescription()));
     return;
   }
 
   ParseTxtRecord([service_ TXTRecordData], &service_description_.metadata);
 
   // TODO(justinlin): Implement last_seen.
   service_description_.last_seen = base::Time::Now();
@@ skipping 109 matching lines @@
   container_->OnResolveUpdate(local_discovery::ServiceResolver::STATUS_SUCCESS);
 }
 
 - (void)netService:(NSNetService *)sender
         didNotResolve:(NSDictionary *)errorDict {
   container_->OnResolveUpdate(
       local_discovery::ServiceResolver::STATUS_REQUEST_TIMEOUT);
 }
 
 @end