summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/bluetooth
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 10:44:34 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 10:44:34 +0000
commitb6ebf078d2ada6bb2e226d58686cc9e7469b55fa (patch)
tree8598e241fc4cce76ad9158102df5df7f79327cb8 /chrome/browser/chromeos/bluetooth
parent41e8daba7c80736e434a23164cf62e8999efe0b2 (diff)
downloadchromium_src-b6ebf078d2ada6bb2e226d58686cc9e7469b55fa.zip
chromium_src-b6ebf078d2ada6bb2e226d58686cc9e7469b55fa.tar.gz
chromium_src-b6ebf078d2ada6bb2e226d58686cc9e7469b55fa.tar.bz2
Move chromeos::GetInterfacesFromIntrospectResult into IntrospectableClient
Since XmlReader was moved from chrome/ to third_party/libxml/, now chromeos/ can depend on it. BUG=119583 TEST=chromeos_unittests Review URL: https://chromiumcodereview.appspot.com/10440013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/bluetooth')
-rw-r--r--chrome/browser/chromeos/bluetooth/bluetooth_device.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
index 051127c..e696d0d 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
@@ -18,7 +18,6 @@
#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/dbus/introspect_util.h"
#include "chromeos/dbus/bluetooth_adapter_client.h"
#include "chromeos/dbus/bluetooth_agent_service_provider.h"
#include "chromeos/dbus/bluetooth_device_client.h"
@@ -354,7 +353,7 @@ void BluetoothDevice::OnIntrospect(ErrorCallback error_callback,
// device. Send appropraite Connect calls for each of those interfaces
// to connect all of the application protocols for this device.
std::vector<std::string> interfaces =
- GetInterfacesFromIntrospectResult(xml_data);
+ IntrospectableClient::GetInterfacesFromIntrospectResult(xml_data);
for (std::vector<std::string>::iterator iter = interfaces.begin();
iter != interfaces.end(); ++iter) {