Change IPEndpoint::address() to return a net::IPAddress

device/bluetooth/bluetooth_socket_win.cc

 // 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.
 
 #include "device/bluetooth/bluetooth_socket_win.h"
 
 #include <objbase.h>
 
 #include <string>
 
@@ skipping 21 matching lines @@
 const char kInvalidRfcommPort[] = "Invalid RFCCOMM port.";
 const char kFailedToCreateSocket[] = "Failed to create socket.";
 const char kFailedToBindSocket[] = "Failed to bind socket.";
 const char kFailedToListenOnSocket[] = "Failed to listen on socket.";
 const char kFailedToGetSockNameForSocket[] = "Failed to getsockname.";
 const char kFailedToAccept[] = "Failed to accept.";
 const char kInvalidUUID[] = "Invalid UUID";
 const char kWsaSetServiceError[] = "WSASetService error.";
 
 std::string IPEndPointToBluetoothAddress(const net::IPEndPoint& end_point) {
-  if (end_point.address().size() != net::kBluetoothAddressSize)
+  if (end_point.address().bytes().size() != net::kBluetoothAddressSize)
     return std::string();
   // The address is copied from BTH_ADDR field of SOCKADDR_BTH, which is a
   // 64-bit ULONGLONG that stores Bluetooth address in little-endian. Print in
   // reverse order to preserve the correct ordering.
-  return base::StringPrintf("%02X:%02X:%02X:%02X:%02X:%02X",
-      end_point.address()[5],
-      end_point.address()[4],
-      end_point.address()[3],
-      end_point.address()[2],
-      end_point.address()[1],
-      end_point.address()[0]);
+  return base::StringPrintf(
+      "%02X:%02X:%02X:%02X:%02X:%02X", end_point.address().bytes()[5],
+      end_point.address().bytes()[4], end_point.address().bytes()[3],
+      end_point.address().bytes()[2], end_point.address().bytes()[1],
+      end_point.address().bytes()[0]);
 }
 
 }  // namespace
 
 namespace device {
 
 struct BluetoothSocketWin::ServiceRegData {
   ServiceRegData() {
     ZeroMemory(&address, sizeof(address));
     ZeroMemory(&address_info, sizeof(address_info));
@@ skipping 324 matching lines @@
     return;
   }
 
   scoped_refptr<BluetoothSocketWin> peer_socket =
       CreateBluetoothSocket(ui_task_runner(), socket_thread());
   peer_socket->SetTCPSocket(accept_socket.Pass());
   success_callback.Run(peer_device, peer_socket);
 }
 
 }  // namespace device