Revert of Migrate Local Discovery from net::IPAddressNumber to net::IPAddress.

chrome/browser/local_discovery/service_discovery_client_mac_unittest.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.
 
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "base/bind.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 109 matching lines @@
       base::Bind(&ServiceDiscoveryClientMacTest::OnResolveComplete,
                  base::Unretained(this)));
 
   const uint8_t record_bytes[] = {2, 'a', 'b', 3, 'd', '=', 'e'};
   base::scoped_nsobject<TestNSNetService> test_service([[TestNSNetService alloc]
       initWithData:[[NSData alloc] initWithBytes:record_bytes
                                           length:arraysize(record_bytes)]]);
 
   const std::string kIp = "2001:4860:4860::8844";
   const uint16_t kPort = 4321;
-  net::IPAddress ip_address;
-  ASSERT_TRUE(net::IPAddress::FromIPLiteral(kIp, &ip_address));
+  net::IPAddressNumber ip_address;
+  ASSERT_TRUE(net::ParseIPLiteralToNumber(kIp, &ip_address));
   net::IPEndPoint endpoint(ip_address, kPort);
   net::SockaddrStorage storage;
   ASSERT_TRUE(endpoint.ToSockAddr(storage.addr, &storage.addr_len));
   NSData* discoveryHost =
       [NSData dataWithBytes:storage.addr length:storage.addr_len];
   NSArray* addresses = @[ discoveryHost ];
   [test_service setAddresses:addresses];
 
   ServiceResolverImplMac* resolver_impl =
       static_cast<ServiceResolverImplMac*>(resolver.get());
   resolver_impl->GetContainerForTesting()->SetServiceForTesting(
       test_service.release());
   resolver->StartResolving();
 
   resolver_impl->GetContainerForTesting()->OnResolveUpdate(
       ServiceResolver::STATUS_SUCCESS);
 
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_EQ(1, num_resolves_);
   EXPECT_EQ(2u, last_service_description_.metadata.size());
   EXPECT_EQ(ip_address, last_service_description_.ip_address);
   EXPECT_EQ(kPort, last_service_description_.address.port());
   EXPECT_EQ(kIp, last_service_description_.address.host());
 }
 
 }  // namespace local_discovery