Renaming BluetoothDeviceMac as BluetoothClassicDeviceMac

device/bluetooth/bluetooth_socket_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 "device/bluetooth/bluetooth_socket_mac.h"
 
 #import <IOBluetooth/IOBluetooth.h>
 
 #include <limits>
 #include <sstream>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "device/bluetooth/bluetooth_adapter_mac.h"
 #include "device/bluetooth/bluetooth_channel_mac.h"
+#include "device/bluetooth/bluetooth_classic_device_mac.h"
 #include "device/bluetooth/bluetooth_device.h"
-#include "device/bluetooth/bluetooth_device_mac.h"
 #include "device/bluetooth/bluetooth_l2cap_channel_mac.h"
 #include "device/bluetooth/bluetooth_rfcomm_channel_mac.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
 
 @interface IOBluetoothDevice (LionSDKDeclarations)
 - (IOReturn)performSDPQuery:(id)target uuids:(NSArray*)uuids;
@@ skipping 426 matching lines @@
     const BluetoothUUID& uuid,
     const base::Closure& success_callback,
     const ErrorCompletionCallback& error_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   uuid_ = uuid;
 
   // Perform an SDP query on the |device| to refresh the cache, in case the
   // services that the |device| advertises have changed since the previous
   // query.
-  DVLOG(1) << BluetoothDeviceMac::GetDeviceAddress(device) << " "
+  DVLOG(1) << BluetoothClassicDeviceMac::GetDeviceAddress(device) << " "
            << uuid_.canonical_value() << ": Sending SDP query.";
   SDPQueryListener* listener =
       [[SDPQueryListener alloc] initWithSocket:this
                                         device:device
                               success_callback:success_callback
                                 error_callback:error_callback];
   [device performSDPQuery:[listener autorelease]
                     uuids:@[GetIOBluetoothSDPUUID(uuid_)]];
 }
 
@@ skipping 50 matching lines @@
 
   success_callback.Run();
 }
 
 void BluetoothSocketMac::OnSDPQueryComplete(
       IOReturn status,
       IOBluetoothDevice* device,
       const base::Closure& success_callback,
       const ErrorCompletionCallback& error_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DVLOG(1) << BluetoothDeviceMac::GetDeviceAddress(device) << " "
+  DVLOG(1) << BluetoothClassicDeviceMac::GetDeviceAddress(device) << " "
            << uuid_.canonical_value() << ": SDP query complete.";
 
   if (status != kIOReturnSuccess) {
     error_callback.Run(kSDPQueryFailed);
     return;
   }
 
   IOBluetoothSDPServiceRecord* record = [device
       getServiceRecordForUUID:GetIOBluetoothSDPUUID(uuid_)];
   if (record == nil) {
@@ skipping 18 matching lines @@
   status = [record getRFCOMMChannelID:&rfcomm_channel_id];
   if (status != kIOReturnSuccess) {
     status = [record getL2CAPPSM:&l2cap_psm];
     if (status != kIOReturnSuccess) {
       error_callback.Run(kProfileNotFound);
       return;
     }
   }
 
   if (rfcomm_channel_id != kInvalidRfcommChannelId) {
-    DVLOG(1) << BluetoothDeviceMac::GetDeviceAddress(device) << " "
-             << uuid_.canonical_value() << ": Opening RFCOMM channel: "
-             << rfcomm_channel_id;
+    DVLOG(1) << BluetoothClassicDeviceMac::GetDeviceAddress(device) << " "
+             << uuid_.canonical_value()
+             << ": Opening RFCOMM channel: " << rfcomm_channel_id;
   } else {
     DCHECK_NE(l2cap_psm, kInvalidL2capPsm);
-    DVLOG(1) << BluetoothDeviceMac::GetDeviceAddress(device) << " "
-             << uuid_.canonical_value() << ": Opening L2CAP channel: "
-             << l2cap_psm;
+    DVLOG(1) << BluetoothClassicDeviceMac::GetDeviceAddress(device) << " "
+             << uuid_.canonical_value()
+             << ": Opening L2CAP channel: " << l2cap_psm;
   }
 
   // Note: It's important to set the connect callbacks *prior* to opening the
   // channel, as opening the channel can synchronously call into
   // OnChannelOpenComplete().
   connect_callbacks_.reset(new ConnectCallbacks());
   connect_callbacks_->success_callback = success_callback;
   connect_callbacks_->error_callback = error_callback;
 
   if (rfcomm_channel_id != kInvalidRfcommChannelId) {
     channel_ = BluetoothRfcommChannelMac::OpenAsync(
         this, device, rfcomm_channel_id, &status);
   } else {
     DCHECK_NE(l2cap_psm, kInvalidL2capPsm);
     channel_ =
         BluetoothL2capChannelMac::OpenAsync(this, device, l2cap_psm, &status);
   }
   if (status != kIOReturnSuccess) {
     ReleaseChannel();
     std::stringstream error;
     error << "Failed to connect bluetooth socket ("
-          << BluetoothDeviceMac::GetDeviceAddress(device) << "): (" << status
-          << ")";
+          << BluetoothClassicDeviceMac::GetDeviceAddress(device) << "): ("
+          << status << ")";
     error_callback.Run(error.str());
     return;
   }
 
-  DVLOG(1) << BluetoothDeviceMac::GetDeviceAddress(device) << " "
-           << uuid_.canonical_value()
-           << ": channel opening in background.";
+  DVLOG(1) << BluetoothClassicDeviceMac::GetDeviceAddress(device) << " "
+           << uuid_.canonical_value() << ": channel opening in background.";
 }
 
 void BluetoothSocketMac::OnChannelOpened(
     scoped_ptr<BluetoothChannelMac> channel) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << uuid_.canonical_value() << ": Incoming channel pending.";
 
   accept_queue_.push(linked_ptr<BluetoothChannelMac>(channel.release()));
   if (accept_request_)
     AcceptConnectionRequest();
@@ skipping 310 matching lines @@
   rfcomm_connection_listener_.reset();
   l2cap_connection_listener_.reset();
 
   // Destroying the listener above prevents the callback delegate from being
   // called so it is now safe to release all callback state.
   accept_request_.reset();
   empty_queue(accept_queue_);
 }
 
 }  // namespace device