diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 20:22:53 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 20:22:53 +0000 |
| commit | 02743b707e2743cd0f0916e3b405191a48fa3947 (patch) | |
| tree | 2b0c0be422f99a2e0dce81c6de92f9a8bc80b969 /net | |
| parent | 7f58f3f417a0598ad796ca7de7b14a38252d91bd (diff) | |
| download | chromium_src-02743b707e2743cd0f0916e3b405191a48fa3947.zip chromium_src-02743b707e2743cd0f0916e3b405191a48fa3947.tar.gz chromium_src-02743b707e2743cd0f0916e3b405191a48fa3947.tar.bz2 | |
Revert 121920 - dbus: add ObjectPath type
Rather than use std::string for object paths, add a dbus::ObjectPath type
that wraps one while allowing more type-safety. This solves all sorts of
issues with confusing object paths for strings, and allows us to do
Properties code using templates disambiguating them from strings.
BUG=chromium:109194
TEST=built and run tests
Change-Id: Icaf6f19daea4af23a9d2ec0ed76d2cbd379d680e
Review URL: http://codereview.chromium.org/9378039
TBR=keybuk@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9363045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/network_change_notifier_linux.cc | 4 | ||||
| -rw-r--r-- | net/base/network_change_notifier_linux_unittest.cc | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc index ff3c3c0..edc77b9 100644 --- a/net/base/network_change_notifier_linux.cc +++ b/net/base/network_change_notifier_linux.cc @@ -137,8 +137,8 @@ void NetworkManagerApi::Init() { // Ignore ServiceUnknown errors to avoid log spam: http://crbug.com/109696. dbus::ObjectProxy* proxy = system_bus_->GetObjectProxyWithOptions( - kNetworkManagerServiceName, dbus::ObjectPath(kNetworkManagerPath), - dbus::ObjectProxy::IGNORE_SERVICE_UNKNOWN_ERRORS); + kNetworkManagerServiceName, kNetworkManagerPath, + dbus::ObjectProxy::IGNORE_SERVICE_UNKNOWN_ERRORS); // Get the initial state asynchronously. dbus::MethodCall method_call(DBUS_INTERFACE_PROPERTIES, "Get"); diff --git a/net/base/network_change_notifier_linux_unittest.cc b/net/base/network_change_notifier_linux_unittest.cc index d8513ce..ecd48a5 100644 --- a/net/base/network_change_notifier_linux_unittest.cc +++ b/net/base/network_change_notifier_linux_unittest.cc @@ -10,7 +10,6 @@ #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "dbus/message.h" -#include "dbus/object_path.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -42,10 +41,9 @@ class NetworkChangeNotifierLinuxTest : public testing::Test { options.bus_type = dbus::Bus::SYSTEM; mock_bus_ = new dbus::MockBus(options); - mock_object_proxy_ = new dbus::MockObjectProxy( - mock_bus_.get(), - "service_name", - dbus::ObjectPath("service_path")); + mock_object_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(), + "service_name", + "service_path"); EXPECT_CALL(*mock_bus_, GetObjectProxyWithOptions(_, _, _)) .WillOnce(Return(mock_object_proxy_.get())); |