diff options
Diffstat (limited to 'chrome/browser')
20 files changed, 171 insertions, 204 deletions
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc b/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc index 65c53f5..2679274 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc +++ b/chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc @@ -49,40 +49,40 @@ class BluetoothAdapterImpl : public BluetoothAdapter, virtual void StartDiscovery() { VLOG(1) << id_ << ": StartDiscovery"; DCHECK(bluetooth_adapter_client_); - bluetooth_adapter_client_->StartDiscovery(dbus::ObjectPath(id_)); + bluetooth_adapter_client_->StartDiscovery(id_); } virtual void StopDiscovery() { VLOG(1) << id_ << ": StopDiscovery"; DCHECK(bluetooth_adapter_client_); - bluetooth_adapter_client_->StopDiscovery(dbus::ObjectPath(id_)); + bluetooth_adapter_client_->StopDiscovery(id_); } // BluetoothAdapterClient::Observer override. - virtual void DiscoveringPropertyChanged(const dbus::ObjectPath& object_path, + virtual void DiscoveringPropertyChanged(const std::string& object_path, bool discovering) { - VLOG(1) << id_ << ": object_path = " << object_path.value() - << ", Discovering = " << discovering; - if (object_path.value() != id_) { + VLOG(1) << id_ << ": object_path = " << object_path << ", Discovering = " + << discovering; + if (object_path != id_) { return; } if (discovering) { FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, - DiscoveryStarted(object_path.value())); + DiscoveryStarted(object_path)); } else { FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, - DiscoveryEnded(object_path.value())); + DiscoveryEnded(object_path)); } } // BluetoothAdapterClient::Observer override. - virtual void DeviceFound(const dbus::ObjectPath& object_path, + virtual void DeviceFound(const std::string& object_path, const std::string& address, const base::DictionaryValue& device_properties) { - VLOG(1) << id_ << ": object_path = " << object_path.value() - << ", Device found: " << address << " (with " - << device_properties.size() << " properties)"; - if (object_path.value() != id_) { + VLOG(1) << id_ << ": object_path = " << object_path << ", Device found: " + << address << " (with " << device_properties.size() + << " properties)"; + if (object_path != id_) { return; } // TODO(vlaviano): later, we will want to persist the device. @@ -90,18 +90,18 @@ class BluetoothAdapterImpl : public BluetoothAdapter, BluetoothDevice::Create(device_properties)); if (device.get() != NULL) { FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, - DeviceFound(object_path.value(), device.get())); + DeviceFound(object_path, device.get())); } else { LOG(WARNING) << "Could not create BluetoothDevice from properties."; } } // BluetoothAdapterClient::Observer override. - virtual void DeviceDisappeared(const dbus::ObjectPath& object_path, + virtual void DeviceDisappeared(const std::string& object_path, const std::string& address) { - VLOG(1) << id_ << ": object_path = " << object_path.value() + VLOG(1) << id_ << ": object_path = " << object_path << ", Device disappeared: " << address; - if (object_path.value() != id_) { + if (object_path != id_) { return; } // For now, we don't propagate this event to our observers. diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_manager.cc b/chrome/browser/chromeos/bluetooth/bluetooth_manager.cc index ef362f0..3161885 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_manager.cc +++ b/chrome/browser/chromeos/bluetooth/bluetooth_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,7 +10,6 @@ #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h" #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" -#include "dbus/object_path.h" namespace chromeos { @@ -51,10 +50,9 @@ class BluetoothManagerImpl : public BluetoothManager, } // BluetoothManagerClient::Observer override. - virtual void AdapterRemoved(const dbus::ObjectPath& adapter) { - VLOG(1) << "AdapterRemoved: " << adapter.value(); - if (default_adapter_.get() == NULL - || default_adapter_->Id() != adapter.value()) { + virtual void AdapterRemoved(const std::string& adapter) { + VLOG(1) << "AdapterRemoved: " << adapter; + if (default_adapter_.get() == NULL || default_adapter_->Id() != adapter) { return; } // The default adapter was removed. @@ -64,8 +62,8 @@ class BluetoothManagerImpl : public BluetoothManager, } // BluetoothManagerClient::Observer override. - virtual void DefaultAdapterChanged(const dbus::ObjectPath& adapter) { - VLOG(1) << "DefaultAdapterChanged: " << adapter.value(); + virtual void DefaultAdapterChanged(const std::string& adapter) { + VLOG(1) << "DefaultAdapterChanged: " << adapter; OnNewDefaultAdapter(adapter); } @@ -75,13 +73,12 @@ class BluetoothManagerImpl : public BluetoothManager, } // We have updated info about the default adapter. - void OnNewDefaultAdapter(const dbus::ObjectPath& adapter) { - VLOG(1) << "OnNewDefaultAdapter: " << adapter.value(); - if (default_adapter_.get() != NULL - && default_adapter_->Id() == adapter.value()) { + void OnNewDefaultAdapter(const std::string& adapter) { + VLOG(1) << "OnNewDefaultAdapter: " << adapter; + if (default_adapter_.get() != NULL && default_adapter_->Id() == adapter) { return; } - default_adapter_.reset(BluetoothAdapter::Create(adapter.value())); + default_adapter_.reset(BluetoothAdapter::Create(adapter)); DCHECK(default_adapter_.get()); FOR_EACH_OBSERVER(BluetoothManager::Observer, observers_, DefaultAdapterChanged(default_adapter_.get())); @@ -89,12 +86,12 @@ class BluetoothManagerImpl : public BluetoothManager, // Called by bluetooth_manager_client when our DefaultAdapter request is // complete - void OnDefaultAdapter(const dbus::ObjectPath& adapter, bool success) { + void OnDefaultAdapter(const std::string& adapter, bool success) { if (!success) { LOG(ERROR) << "OnDefaultAdapter: failed."; return; } - VLOG(1) << "OnDefaultAdapter: " << adapter.value(); + VLOG(1) << "OnDefaultAdapter: " << adapter; OnNewDefaultAdapter(adapter); } diff --git a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.cc b/chrome/browser/chromeos/dbus/bluetooth_adapter_client.cc index bb62d53..54b772d 100644 --- a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.cc +++ b/chrome/browser/chromeos/dbus/bluetooth_adapter_client.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -143,11 +142,11 @@ bool PopArrayOfDictEntries(dbus::MessageReader* reader, break; } case dbus::Message::OBJECT_PATH: { - dbus::ObjectPath value; + std::string value; if (!variant_reader.PopObjectPath(&value)) { return false; } - dictionary->SetString(key, value.value()); + dictionary->SetString(key, value); break; } case dbus::Message::ARRAY: { @@ -209,8 +208,8 @@ class BluetoothAdapterClientImpl: public BluetoothAdapterClient, } // BluetoothAdapterClient override. - virtual void StartDiscovery(const dbus::ObjectPath& object_path) { - VLOG(1) << "StartDiscovery: " << object_path.value(); + virtual void StartDiscovery(const std::string& object_path) { + VLOG(1) << "StartDiscovery: " << object_path; dbus::MethodCall method_call( bluetooth_adapter::kBluetoothAdapterInterface, @@ -226,8 +225,8 @@ class BluetoothAdapterClientImpl: public BluetoothAdapterClient, } // BluetoothAdapterClient override. - virtual void StopDiscovery(const dbus::ObjectPath& object_path) { - VLOG(1) << "StopDiscovery: " << object_path.value(); + virtual void StopDiscovery(const std::string& object_path) { + VLOG(1) << "StopDiscovery: " << object_path; dbus::MethodCall method_call( bluetooth_adapter::kBluetoothAdapterInterface, @@ -244,22 +243,21 @@ class BluetoothAdapterClientImpl: public BluetoothAdapterClient, private: // BluetoothManagerClient::Observer override. - virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE { - VLOG(1) << "AdapterAdded: " << object_path.value(); + virtual void AdapterAdded(const std::string& object_path) OVERRIDE { + VLOG(1) << "AdapterAdded: " << object_path; } // BluetoothManagerClient::Observer override. - virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE { - VLOG(1) << "AdapterRemoved: " << object_path.value(); + virtual void AdapterRemoved(const std::string& object_path) OVERRIDE { + VLOG(1) << "AdapterRemoved: " << object_path; RemoveObjectProxyForPath(object_path); } // Ensures that we have a dbus object proxy for an adapter with dbus // object path |object_path|, and if not, creates it and stores it in // our |proxy_map_| map. - dbus::ObjectProxy* GetObjectProxyForPath( - const dbus::ObjectPath& object_path) { - VLOG(1) << "GetObjectProxyForPath: " << object_path.value(); + dbus::ObjectProxy* GetObjectProxyForPath(const std::string& object_path) { + VLOG(1) << "GetObjectProxyForPath: " << object_path; ProxyMap::iterator it = proxy_map_.find(object_path); if (it != proxy_map_.end()) @@ -316,129 +314,126 @@ class BluetoothAdapterClientImpl: public BluetoothAdapterClient, // Removes the dbus object proxy for the adapter with dbus object path // |object_path| from our |proxy_map_| map. - void RemoveObjectProxyForPath(const dbus::ObjectPath& object_path) { - VLOG(1) << "RemoveObjectProxyForPath: " << object_path.value(); + void RemoveObjectProxyForPath(const std::string& object_path) { + VLOG(1) << "RemoveObjectProxyForPath: " << object_path; proxy_map_.erase(object_path); } // Called by dbus:: when a DeviceCreated signal is received. - void DeviceCreatedReceived(const dbus::ObjectPath& object_path, + void DeviceCreatedReceived(const std::string& object_path, dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); - dbus::ObjectPath device_path; + std::string device_path; if (!reader.PopObjectPath(&device_path)) { - LOG(ERROR) << object_path.value() - << ": DeviceCreated signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": DeviceCreated signal has incorrect parameters: " + << signal->ToString(); return; } - VLOG(1) << object_path.value() << ": Device created: " - << device_path.value(); + VLOG(1) << object_path << ": Device created: " << device_path; FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_, DeviceCreated(object_path, device_path)); } // Called by dbus:: when the DeviceCreated signal is initially connected. - void DeviceCreatedConnected(const dbus::ObjectPath& object_path, + void DeviceCreatedConnected(const std::string& object_path, const std::string& interface_name, const std::string& signal_name, bool success) { - LOG_IF(WARNING, !success) << object_path.value() - << ": Failed to connect to DeviceCreated signal."; + LOG_IF(WARNING, !success) << object_path + << ": Failed to connect to DeviceCreated signal."; } // Called by dbus:: when a DeviceRemoved signal is received. - void DeviceRemovedReceived(const dbus::ObjectPath& object_path, + void DeviceRemovedReceived(const std::string& object_path, dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); - dbus::ObjectPath device_path; + std::string device_path; if (!reader.PopObjectPath(&device_path)) { - LOG(ERROR) << object_path.value() - << ": DeviceRemoved signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": DeviceRemoved signal has incorrect parameters: " + << signal->ToString(); return; } - VLOG(1) << object_path.value() << ": Device removed: " - << device_path.value(); + VLOG(1) << object_path << ": Device removed: " << device_path; FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_, DeviceRemoved(object_path, device_path)); } // Called by dbus:: when the DeviceRemoved signal is initially connected. - void DeviceRemovedConnected(const dbus::ObjectPath& object_path, + void DeviceRemovedConnected(const std::string& object_path, const std::string& interface_name, const std::string& signal_name, bool success) { - LOG_IF(WARNING, !success) << object_path.value() - << ": Failed to connect to DeviceRemoved signal."; + LOG_IF(WARNING, !success) << object_path + << ": Failed to connect to DeviceRemoved signal."; } // Called by dbus:: when a PropertyChanged signal is received. - void PropertyChangedReceived(const dbus::ObjectPath& object_path, + void PropertyChangedReceived(const std::string& object_path, dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); std::string property_name; if (!reader.PopString(&property_name)) { - LOG(ERROR) << object_path.value() - << ": PropertyChanged signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": PropertyChanged signal has incorrect parameters: " + << signal->ToString(); return; } if (property_name != bluetooth_adapter::kDiscoveringProperty) { - VLOG(1) << object_path.value() << ": PropertyChanged: " << property_name; + VLOG(1) << object_path << ": PropertyChanged: " << property_name; // We don't care. return; } bool discovering = false; if (!reader.PopVariantOfBool(&discovering)) { - LOG(ERROR) << object_path.value() - << ": PropertyChanged signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": PropertyChanged signal has incorrect parameters: " + << signal->ToString(); return; } - VLOG(1) << object_path.value() << ": PropertyChanged: Discovering = " - << discovering; + VLOG(1) << object_path << ": PropertyChanged: Discovering = " + << discovering; FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_, DiscoveringPropertyChanged(object_path, discovering)); } // Called by dbus:: when the PropertyChanged signal is initially connected. - void PropertyChangedConnected(const dbus::ObjectPath& object_path, + void PropertyChangedConnected(const std::string& object_path, const std::string& interface_name, const std::string& signal_name, bool success) { - LOG_IF(WARNING, !success) - << object_path.value() + LOG_IF(WARNING, !success) << object_path << ": Failed to connect to PropertyChanged signal."; } // Called by dbus:: when a DeviceFound signal is received. - void DeviceFoundReceived(const dbus::ObjectPath& object_path, + void DeviceFoundReceived(const std::string& object_path, dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); std::string address; if (!reader.PopString(&address)) { - LOG(ERROR) << object_path.value() - << ": DeviceFound signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": DeviceFound signal has incorrect parameters: " + << signal->ToString(); return; } - VLOG(1) << object_path.value() << ": Device found: " << address; + VLOG(1) << object_path << ": Device found: " << address; DictionaryValue device_properties; if (!PopArrayOfDictEntries(&reader, signal, &device_properties)) { - LOG(ERROR) << object_path.value() - << ": DeviceFound signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": DeviceFound signal has incorrect parameters: " + << signal->ToString(); return; } @@ -447,55 +442,52 @@ class BluetoothAdapterClientImpl: public BluetoothAdapterClient, } // Called by dbus:: when the DeviceFound signal is initially connected. - void DeviceFoundConnected(const dbus::ObjectPath& object_path, + void DeviceFoundConnected(const std::string& object_path, const std::string& interface_name, const std::string& signal_name, bool success) { - LOG_IF(WARNING, !success) << object_path.value() - << ": Failed to connect to DeviceFound signal."; + LOG_IF(WARNING, !success) << object_path + << ": Failed to connect to DeviceFound signal."; } // Called by dbus:: when a DeviceDisappeared signal is received. - void DeviceDisappearedReceived(const dbus::ObjectPath& object_path, + void DeviceDisappearedReceived(const std::string& object_path, dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); std::string address; if (!reader.PopString(&address)) { - LOG(ERROR) << object_path.value() - << ": DeviceDisappeared signal has incorrect parameters: " - << signal->ToString(); + LOG(ERROR) << object_path + << ": DeviceDisappeared signal has incorrect parameters: " + << signal->ToString(); return; } - VLOG(1) << object_path.value() << ": Device disappeared: " << address; + VLOG(1) << object_path << ": Device disappeared: " << address; FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_, DeviceDisappeared(object_path, address)); } // Called by dbus:: when the DeviceDisappeared signal is initially connected. - void DeviceDisappearedConnected(const dbus::ObjectPath& object_path, + void DeviceDisappearedConnected(const std::string& object_path, const std::string& interface_name, const std::string& signal_name, bool success) { - LOG_IF(WARNING, !success) - << object_path.value() + LOG_IF(WARNING, !success) << object_path << ": Failed to connect to DeviceDisappeared signal."; } // Called when a response for StartDiscovery() is received. - void OnStartDiscovery(const dbus::ObjectPath& object_path, + void OnStartDiscovery(const std::string& object_path, dbus::Response* response) { - VLOG(1) << "OnStartDiscovery: " << object_path.value(); - LOG_IF(WARNING, !response) << object_path.value() - << ": OnStartDiscovery: failed."; + VLOG(1) << "OnStartDiscovery: " << object_path; + LOG_IF(WARNING, !response) << object_path << ": OnStartDiscovery: failed."; } // Called when a response for StopDiscovery() is received. - void OnStopDiscovery(const dbus::ObjectPath& object_path, + void OnStopDiscovery(const std::string& object_path, dbus::Response* response) { - VLOG(1) << "OnStopDiscovery: " << object_path.value(); - LOG_IF(WARNING, !response) << object_path.value() - << ": OnStopDiscovery: failed."; + VLOG(1) << "OnStopDiscovery: " << object_path; + LOG_IF(WARNING, !response) << object_path << ": OnStopDiscovery: failed."; } // Weak pointer factory for generating 'this' pointers that might live longer @@ -505,7 +497,7 @@ class BluetoothAdapterClientImpl: public BluetoothAdapterClient, dbus::Bus* bus_; // We maintain a collection of dbus object proxies, one for each adapter. - typedef std::map<const dbus::ObjectPath, dbus::ObjectProxy*> ProxyMap; + typedef std::map<const std::string, dbus::ObjectProxy*> ProxyMap; ProxyMap proxy_map_; // List of observers interested in event notifications from us. @@ -529,13 +521,13 @@ class BluetoothAdapterClientStubImpl : public BluetoothAdapterClient { } // BluetoothAdapterClient override. - virtual void StartDiscovery(const dbus::ObjectPath& object_path) { - VLOG(1) << "StartDiscovery: " << object_path.value(); + virtual void StartDiscovery(const std::string& object_path) { + VLOG(1) << "StartDiscovery: " << object_path; } // BluetoothAdapterClient override. - virtual void StopDiscovery(const dbus::ObjectPath& object_path) { - VLOG(1) << "StopDiscovery: " << object_path.value(); + virtual void StopDiscovery(const std::string& object_path) { + VLOG(1) << "StopDiscovery: " << object_path; } }; diff --git a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h b/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h index 2e7e0f0..e740100 100644 --- a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h +++ b/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/observer_list.h" #include "base/values.h" -#include "dbus/object_path.h" namespace dbus { class Bus; @@ -31,25 +30,25 @@ class BluetoothAdapterClient { virtual ~Observer() {} // Called when a new known device has been created. - virtual void DeviceCreated(const dbus::ObjectPath& object_path, - const dbus::ObjectPath& device_path) {} + virtual void DeviceCreated(const std::string& object_path, + const std::string& device_path) {} // Called when a previously known device is removed. - virtual void DeviceRemoved(const dbus::ObjectPath& object_path, - const dbus::ObjectPath& device_path) {} + virtual void DeviceRemoved(const std::string& object_path, + const std::string& device_path) {} // Called when the adapter's Discovering property changes. - virtual void DiscoveringPropertyChanged(const dbus::ObjectPath& object_path, + virtual void DiscoveringPropertyChanged(const std::string& object_path, bool discovering) {} // Called when a new remote device has been discovered. // |device_properties| should be copied if needed. - virtual void DeviceFound(const dbus::ObjectPath& object_path, + virtual void DeviceFound(const std::string& object_path, const std::string& address, const DictionaryValue& device_properties) {} // Called when a previously discovered device is no longer visible. - virtual void DeviceDisappeared(const dbus::ObjectPath& object_path, + virtual void DeviceDisappeared(const std::string& object_path, const std::string& address) {} }; @@ -61,11 +60,11 @@ class BluetoothAdapterClient { virtual void RemoveObserver(Observer* observer) = 0; // Starts a device discovery on the adapter with object path |object_path|. - virtual void StartDiscovery(const dbus::ObjectPath& object_path) = 0; + virtual void StartDiscovery(const std::string& object_path) = 0; // Cancels any previous device discovery on the adapter with object path // |object_path|. - virtual void StopDiscovery(const dbus::ObjectPath& object_path) = 0; + virtual void StopDiscovery(const std::string& object_path) = 0; // Creates the instance. static BluetoothAdapterClient* Create(dbus::Bus* bus, diff --git a/chrome/browser/chromeos/dbus/bluetooth_device_client.cc b/chrome/browser/chromeos/dbus/bluetooth_device_client.cc index 78121fc..6069681 100644 --- a/chrome/browser/chromeos/dbus/bluetooth_device_client.cc +++ b/chrome/browser/chromeos/dbus/bluetooth_device_client.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -54,24 +53,23 @@ class BluetoothDeviceClientImpl: public BluetoothDeviceClient, private: // BluetoothAdapterClient::Observer override. - virtual void DeviceCreated(const dbus::ObjectPath& adapter_path, - const dbus::ObjectPath& object_path) OVERRIDE { - VLOG(1) << "DeviceCreated: " << object_path.value(); + virtual void DeviceCreated(const std::string& adapter_path, + const std::string& object_path) OVERRIDE { + VLOG(1) << "DeviceCreated: " << object_path; } // BluetoothAdapterClient::Observer override. - virtual void DeviceRemoved(const dbus::ObjectPath& adapter_path, - const dbus::ObjectPath& object_path) OVERRIDE { - VLOG(1) << "DeviceRemoved: " << object_path.value(); + virtual void DeviceRemoved(const std::string& adapter_path, + const std::string& object_path) OVERRIDE { + VLOG(1) << "DeviceRemoved: " << object_path; RemoveObjectProxyForPath(object_path); } // Ensures that we have a dbus object proxy for a device with dbus // object path |object_path|, and if not, creates it stores it in // our |proxy_map_| map. - dbus::ObjectProxy* GetObjectProxyForPath( - const dbus::ObjectPath& object_path) { - VLOG(1) << "GetObjectProxyForPath: " << object_path.value(); + dbus::ObjectProxy* GetObjectProxyForPath(const std::string& object_path) { + VLOG(1) << "GetObjectProxyForPath: " << object_path; ProxyMap::iterator it = proxy_map_.find(object_path); if (it != proxy_map_.end()) @@ -88,8 +86,8 @@ class BluetoothDeviceClientImpl: public BluetoothDeviceClient, // Removes the dbus object proxy for the device with dbus object path // |object_path| from our |proxy_map_| map. - void RemoveObjectProxyForPath(const dbus::ObjectPath& object_path) { - VLOG(1) << "RemoveObjectProxyForPath: " << object_path.value(); + void RemoveObjectProxyForPath(const std::string& object_path) { + VLOG(1) << "RemoveObjectProxyForPath: " << object_path; proxy_map_.erase(object_path); } @@ -100,7 +98,7 @@ class BluetoothDeviceClientImpl: public BluetoothDeviceClient, dbus::Bus* bus_; // We maintain a collection of dbus object proxies, one for each device. - typedef std::map<const dbus::ObjectPath, dbus::ObjectProxy*> ProxyMap; + typedef std::map<const std::string, dbus::ObjectProxy*> ProxyMap; ProxyMap proxy_map_; // List of observers interested in event notifications from us. diff --git a/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc b/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc index f65fa84..12f1e8a 100644 --- a/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc +++ b/chrome/browser/chromeos/dbus/bluetooth_manager_client.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -27,7 +26,7 @@ class BluetoothManagerClientImpl : public BluetoothManagerClient { bluetooth_manager_proxy_ = bus->GetObjectProxy( bluetooth_manager::kBluetoothManagerServiceName, - dbus::ObjectPath(bluetooth_manager::kBluetoothManagerServicePath)); + bluetooth_manager::kBluetoothManagerServicePath); bluetooth_manager_proxy_->ConnectToSignal( bluetooth_manager::kBluetoothManagerInterface, @@ -92,13 +91,13 @@ class BluetoothManagerClientImpl : public BluetoothManagerClient { void AdapterAddedReceived(dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); - dbus::ObjectPath object_path; + std::string object_path; if (!reader.PopObjectPath(&object_path)) { LOG(ERROR) << "AdapterAdded signal has incorrect parameters: " - << signal->ToString(); + << signal->ToString(); return; } - VLOG(1) << "Adapter added: " << object_path.value(); + VLOG(1) << "Adapter added: " << object_path; FOR_EACH_OBSERVER(Observer, observers_, AdapterAdded(object_path)); } @@ -113,13 +112,13 @@ class BluetoothManagerClientImpl : public BluetoothManagerClient { void AdapterRemovedReceived(dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); - dbus::ObjectPath object_path; + std::string object_path; if (!reader.PopObjectPath(&object_path)) { LOG(ERROR) << "AdapterRemoved signal has incorrect parameters: " - << signal->ToString(); + << signal->ToString(); return; } - VLOG(1) << "Adapter removed: " << object_path.value(); + VLOG(1) << "Adapter removed: " << object_path; FOR_EACH_OBSERVER(Observer, observers_, AdapterRemoved(object_path)); } @@ -134,14 +133,14 @@ class BluetoothManagerClientImpl : public BluetoothManagerClient { void DefaultAdapterChangedReceived(dbus::Signal* signal) { DCHECK(signal); dbus::MessageReader reader(signal); - dbus::ObjectPath object_path; - if (!reader.PopObjectPath(&object_path)) { + std::string adapter; + if (!reader.PopObjectPath(&adapter)) { LOG(ERROR) << "DefaultAdapterChanged signal has incorrect parameters: " - << signal->ToString(); + << signal->ToString(); return; } - VLOG(1) << "Default adapter changed: " << object_path.value(); - FOR_EACH_OBSERVER(Observer, observers_, DefaultAdapterChanged(object_path)); + VLOG(1) << "Default adapter changed: " << adapter; + FOR_EACH_OBSERVER(Observer, observers_, DefaultAdapterChanged(adapter)); } // Called by dbus:: when the DefaultAdapterChanged signal is initially @@ -158,15 +157,15 @@ class BluetoothManagerClientImpl : public BluetoothManagerClient { dbus::Response* response) { // Parse response. bool success = false; - dbus::ObjectPath adapter; + std::string adapter; if (response != NULL) { dbus::MessageReader reader(response); if (!reader.PopObjectPath(&adapter)) { LOG(ERROR) << "DefaultAdapter response has incorrect parameters: " - << response->ToString(); + << response->ToString(); } else { success = true; - LOG(INFO) << "OnDefaultAdapter: " << adapter.value(); + LOG(INFO) << "OnDefaultAdapter: " << adapter; } } else { LOG(ERROR) << "Failed to get default adapter."; diff --git a/chrome/browser/chromeos/dbus/bluetooth_manager_client.h b/chrome/browser/chromeos/dbus/bluetooth_manager_client.h index a74f925..394f9c9 100644 --- a/chrome/browser/chromeos/dbus/bluetooth_manager_client.h +++ b/chrome/browser/chromeos/dbus/bluetooth_manager_client.h @@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/observer_list.h" -#include "dbus/object_path.h" namespace dbus { class Bus; @@ -29,16 +28,16 @@ class BluetoothManagerClient { // Called when a local bluetooth adapter is added. // |object_path| is the dbus object path of the adapter. - virtual void AdapterAdded(const dbus::ObjectPath& object_path) {} + virtual void AdapterAdded(const std::string& object_path) {} // Called when a local bluetooth adapter is removed. // |object_path| is the dbus object path of the adapter. - virtual void AdapterRemoved(const dbus::ObjectPath& object_path) {} + virtual void AdapterRemoved(const std::string& object_path) {} // Called when the default local bluetooth adapter changes. - // |object_path| is the dbus object path of the new default adapter. + // |adapter| is the dbus object path of the new default adapter. // Not called if all adapters are removed. - virtual void DefaultAdapterChanged(const dbus::ObjectPath& object_path) {} + virtual void DefaultAdapterChanged(const std::string& adapter) {} }; virtual ~BluetoothManagerClient(); @@ -48,9 +47,9 @@ class BluetoothManagerClient { virtual void RemoveObserver(Observer* observer) = 0; // The DefaultAdapterCallback receives two arguments: - // dbus::ObjectPath object_path - the path of the new default adapter + // std::string adapter - the unique identifier of the default adapter // bool success - whether or not the request succeeded - typedef base::Callback<void(const dbus::ObjectPath&, bool)> + typedef base::Callback<void(const std::string&, bool)> DefaultAdapterCallback; // Retrieves the dbus object path for the default adapter. diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc index 5f912ed..bb1bdcb 100644 --- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc +++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,6 @@ #include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/exported_object.h" -#include "dbus/object_path.h" #include "third_party/cros_system_api/dbus/service_constants.h" namespace chromeos { @@ -41,7 +40,7 @@ class CrosDBusServiceImpl : public CrosDBusService { exported_object_ = bus_->GetExportedObject( kLibCrosServiceName, - dbus::ObjectPath(kLibCrosServicePath)); + kLibCrosServicePath); for (size_t i = 0; i < service_providers_.size(); ++i) service_providers_[i]->Start(exported_object_); diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc index 3dc6359..649f678 100644 --- a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc +++ b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,6 @@ #include "dbus/mock_bus.h" #include "dbus/mock_exported_object.h" #include "dbus/mock_object_proxy.h" -#include "dbus/object_path.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -49,12 +48,12 @@ class CrosDBusServiceTest : public testing::Test { mock_exported_object_ = new dbus::MockExportedObject(mock_bus_.get(), kLibCrosServiceName, - dbus::ObjectPath(kLibCrosServicePath)); + kLibCrosServicePath); // |mock_bus_|'s GetExportedObject() will return mock_exported_object_| // for the given service name and the object path. EXPECT_CALL(*mock_bus_, GetExportedObject( - kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath))) + kLibCrosServiceName, kLibCrosServicePath)) .WillOnce(Return(mock_exported_object_.get())); // Create a mock proxy resolution service. diff --git a/chrome/browser/chromeos/dbus/cros_disks_client.cc b/chrome/browser/chromeos/dbus/cros_disks_client.cc index 210a71d..63e63df 100644 --- a/chrome/browser/chromeos/dbus/cros_disks_client.cc +++ b/chrome/browser/chromeos/dbus/cros_disks_client.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -106,9 +105,8 @@ bool MaybePopArrayOfStrings(dbus::MessageReader* reader, class CrosDisksClientImpl : public CrosDisksClient { public: explicit CrosDisksClientImpl(dbus::Bus* bus) - : proxy_(bus->GetObjectProxy( - cros_disks::kCrosDisksServiceName, - dbus::ObjectPath(cros_disks::kCrosDisksServicePath))), + : proxy_(bus->GetObjectProxy(cros_disks::kCrosDisksServiceName, + cros_disks::kCrosDisksServicePath)), weak_ptr_factory_(this) { } diff --git a/chrome/browser/chromeos/dbus/image_burner_client.cc b/chrome/browser/chromeos/dbus/image_burner_client.cc index 49ea93f..813ed47 100644 --- a/chrome/browser/chromeos/dbus/image_burner_client.cc +++ b/chrome/browser/chromeos/dbus/image_burner_client.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -23,9 +22,8 @@ class ImageBurnerClientImpl : public ImageBurnerClient { explicit ImageBurnerClientImpl(dbus::Bus* bus) : proxy_(NULL), weak_ptr_factory_(this) { - proxy_ = bus->GetObjectProxy( - imageburn::kImageBurnServiceName, - dbus::ObjectPath(imageburn::kImageBurnServicePath)); + proxy_ = bus->GetObjectProxy(imageburn::kImageBurnServiceName, + imageburn::kImageBurnServicePath); proxy_->ConnectToSignal( imageburn::kImageBurnServiceInterface, imageburn::kSignalBurnFinishedName, diff --git a/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h b/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h index 47c1c9d..6cd0de9 100644 --- a/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h +++ b/chrome/browser/chromeos/dbus/mock_bluetooth_adapter_client.h @@ -19,8 +19,8 @@ class MockBluetoothAdapterClient : public BluetoothAdapterClient { MOCK_METHOD1(AddObserver, void(Observer*)); MOCK_METHOD1(RemoveObserver, void(Observer*)); - MOCK_METHOD1(StartDiscovery, void(const dbus::ObjectPath&)); - MOCK_METHOD1(StopDiscovery, void(const dbus::ObjectPath&)); + MOCK_METHOD1(StartDiscovery, void(const std::string&)); + MOCK_METHOD1(StopDiscovery, void(const std::string&)); }; } // namespace chromeos diff --git a/chrome/browser/chromeos/dbus/power_manager_client.cc b/chrome/browser/chromeos/dbus/power_manager_client.cc index 54e7ab7..1391dbfc 100644 --- a/chrome/browser/chromeos/dbus/power_manager_client.cc +++ b/chrome/browser/chromeos/dbus/power_manager_client.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -64,7 +63,7 @@ class PowerManagerClientImpl : public PowerManagerClient { weak_ptr_factory_(this) { power_manager_proxy_ = bus->GetObjectProxy( power_manager::kPowerManagerServiceName, - dbus::ObjectPath(power_manager::kPowerManagerServicePath)); + power_manager::kPowerManagerServicePath); // Monitor the D-Bus signal for brightness changes. Only the power // manager knows the actual brightness level. We don't cache the diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc index e7f3f9fb..9cbbdf5 100644 --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -22,7 +22,6 @@ #include "dbus/mock_bus.h" #include "dbus/mock_exported_object.h" #include "dbus/mock_object_proxy.h" -#include "dbus/object_path.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -81,7 +80,7 @@ class ProxyResolutionServiceProviderTest : public testing::Test { mock_exported_object_ = new dbus::MockExportedObject(mock_bus_.get(), kLibCrosServiceName, - dbus::ObjectPath(kLibCrosServicePath)); + kLibCrosServicePath); // |mock_exported_object_|'s ExportMethod() will use // |MockExportedObject(). @@ -103,7 +102,7 @@ class ProxyResolutionServiceProviderTest : public testing::Test { mock_object_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(), kLibCrosServiceName, - dbus::ObjectPath(kLibCrosServicePath)); + kLibCrosServicePath); // |mock_object_proxy_|'s CallMethodAndBlock() will use // MockCallMethodAndBlock() to return responses. EXPECT_CALL(*mock_object_proxy_, diff --git a/chrome/browser/chromeos/dbus/sensors_client.cc b/chrome/browser/chromeos/dbus/sensors_client.cc index f8c03f4..ff0dd8d 100644 --- a/chrome/browser/chromeos/dbus/sensors_client.cc +++ b/chrome/browser/chromeos/dbus/sensors_client.cc @@ -11,7 +11,6 @@ #include "content/public/browser/sensors_provider.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" using content::BrowserThread; @@ -32,9 +31,8 @@ class SensorsClientImpl : public SensorsClient { explicit SensorsClientImpl(dbus::Bus* bus) : sensors_proxy_(NULL), weak_ptr_factory_(this) { - sensors_proxy_ = bus->GetObjectProxy( - chromeos::kSensorsServiceName, - dbus::ObjectPath(chromeos::kSensorsServicePath)); + sensors_proxy_ = bus->GetObjectProxy(chromeos::kSensorsServiceName, + chromeos::kSensorsServicePath); sensors_proxy_->ConnectToSignal( chromeos::kSensorsServiceInterface, chromeos::kScreenOrientationChanged, diff --git a/chrome/browser/chromeos/dbus/session_manager_client.cc b/chrome/browser/chromeos/dbus/session_manager_client.cc index a4b3579..b2643c7 100644 --- a/chrome/browser/chromeos/dbus/session_manager_client.cc +++ b/chrome/browser/chromeos/dbus/session_manager_client.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,7 +10,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -24,7 +23,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_(this) { session_manager_proxy_ = bus->GetObjectProxy( login_manager::kSessionManagerServiceName, - dbus::ObjectPath(login_manager::kSessionManagerServicePath)); + login_manager::kSessionManagerServicePath); // Monitor the D-Bus signal for owner key changes. session_manager_proxy_->ConnectToSignal( diff --git a/chrome/browser/chromeos/dbus/speech_synthesizer_client.cc b/chrome/browser/chromeos/dbus/speech_synthesizer_client.cc index 5c474c8..745b4ba 100644 --- a/chrome/browser/chromeos/dbus/speech_synthesizer_client.cc +++ b/chrome/browser/chromeos/dbus/speech_synthesizer_client.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -33,7 +32,7 @@ class SpeechSynthesizerClientImpl : public SpeechSynthesizerClient { weak_ptr_factory_(this) { proxy_ = bus->GetObjectProxy( speech_synthesis::kSpeechSynthesizerServiceName, - dbus::ObjectPath(speech_synthesis::kSpeechSynthesizerServicePath)); + speech_synthesis::kSpeechSynthesizerServicePath); } virtual ~SpeechSynthesizerClientImpl() {} diff --git a/chrome/browser/chromeos/dbus/update_engine_client.cc b/chrome/browser/chromeos/dbus/update_engine_client.cc index 9352375..ed5cecb 100644 --- a/chrome/browser/chromeos/dbus/update_engine_client.cc +++ b/chrome/browser/chromeos/dbus/update_engine_client.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,7 +10,6 @@ #include "chrome/browser/chromeos/system/runtime_environment.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -55,7 +54,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient { last_status_() { update_engine_proxy_ = bus->GetObjectProxy( update_engine::kUpdateEngineServiceName, - dbus::ObjectPath(update_engine::kUpdateEngineServicePath)); + update_engine::kUpdateEngineServicePath); // Monitor the D-Bus signal for brightness changes. Only the power // manager knows the actual brightness level. We don't cache the diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 787ed5b..d74898d 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -15,7 +15,6 @@ #include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" @@ -104,8 +103,7 @@ void NativeBackendKWallet::InitOnDBThread(scoped_refptr<dbus::Bus> optional_bus, session_bus_ = new dbus::Bus(options); } kwallet_proxy_ = - session_bus_->GetObjectProxy(kKWalletServiceName, - dbus::ObjectPath(kKWalletPath)); + session_bus_->GetObjectProxy(kKWalletServiceName, kKWalletPath); // kwalletd may not be running. If we get a temporary failure initializing it, // try to start it and then try again. (Note the short-circuit evaluation.) const InitResult result = InitWallet(); @@ -120,8 +118,7 @@ bool NativeBackendKWallet::StartKWalletd() { // Sadly kwalletd doesn't use DBus activation, so we have to make a call to // klauncher to start it. dbus::ObjectProxy* klauncher = - session_bus_->GetObjectProxy(kKLauncherServiceName, - dbus::ObjectPath(kKLauncherPath)); + session_bus_->GetObjectProxy(kKLauncherServiceName, kKLauncherPath); dbus::MethodCall method_call(kKLauncherInterface, "start_service_by_desktop_name"); diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index dbdcd20..a091be5 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -20,7 +20,6 @@ #include "dbus/message.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" -#include "dbus/object_path.h" #include "dbus/object_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -226,7 +225,7 @@ void NativeBackendKWalletTest::SetUp() { mock_klauncher_proxy_ = new dbus::MockObjectProxy(mock_session_bus_.get(), "org.kde.klauncher", - dbus::ObjectPath("/KLauncher")); + "/KLauncher"); EXPECT_CALL(*mock_klauncher_proxy_, CallMethodAndBlock(_, _)) .WillRepeatedly(Invoke(this, @@ -235,7 +234,7 @@ void NativeBackendKWalletTest::SetUp() { mock_kwallet_proxy_ = new dbus::MockObjectProxy(mock_session_bus_.get(), "org.kde.kwalletd", - dbus::ObjectPath("/modules/kwalletd")); + "/modules/kwalletd"); EXPECT_CALL(*mock_kwallet_proxy_, CallMethodAndBlock(_, _)) .WillRepeatedly(Invoke(this, @@ -243,11 +242,11 @@ void NativeBackendKWalletTest::SetUp() { EXPECT_CALL(*mock_session_bus_, GetObjectProxy( "org.kde.klauncher", - dbus::ObjectPath("/KLauncher"))) + "/KLauncher")) .WillRepeatedly(Return(mock_klauncher_proxy_.get())); EXPECT_CALL(*mock_session_bus_, GetObjectProxy( "org.kde.kwalletd", - dbus::ObjectPath("/modules/kwalletd"))) + "/modules/kwalletd")) .WillRepeatedly(Return(mock_kwallet_proxy_.get())); EXPECT_CALL(*mock_session_bus_, |