Ensure canonical Bluetooth UUIDs are used.

chrome/browser/chromeos/bluetooth/bluetooth_device.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 "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_agent_service_provider.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
@@ skipping 153 matching lines @@
           object_path_,
           "",  // empty pattern to browse all services
           base::Bind(&BluetoothDevice::CollectServiceRecordsCallback,
                      weak_ptr_factory_.GetWeakPtr(),
                      callback,
                      error_callback));
 }
 
 bool BluetoothDevice::ProvidesServiceWithUUID(const std::string& uuid) const {
   const BluetoothDevice::ServiceList& services = GetServices();
-  for (BluetoothDevice::ServiceList::const_iterator j = services.begin();
-      j != services.end(); ++j) {
-    if (*j == uuid)
+  for (BluetoothDevice::ServiceList::const_iterator iter = services.begin();
+      iter != services.end(); ++iter) {
+    if (bluetooth_utils::CanonicalUuid(*iter) == uuid)
       return true;
   }
   return false;
 }
 
 void BluetoothDevice::ProvidesServiceWithName(const std::string& name,
     const ProvidesServiceCallback& callback) {
   GetServiceRecords(
       base::Bind(&BluetoothDevice::SearchServicesForNameCallback,
                  weak_ptr_factory_.GetWeakPtr(),
@@ skipping 552 matching lines @@
   pairing_delegate_->DismissDisplayOrConfirm();
 }
 
 
 // static
 BluetoothDevice* BluetoothDevice::Create(BluetoothAdapter* adapter) {
   return new BluetoothDevice(adapter);
 }
 
 }  // namespace chromeos