diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 17:35:26 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 17:35:26 +0000 |
| commit | e8af26a89827aeb3264c42e28353bec1f0e38e47 (patch) | |
| tree | 7273dc62fdb300b4d06480ec91458db9a886be9c /chromeos/dbus/shill_manager_client_unittest.cc | |
| parent | d6ef43013cecd620584413086b37a93f46e7f9b2 (diff) | |
| download | chromium_src-e8af26a89827aeb3264c42e28353bec1f0e38e47.zip chromium_src-e8af26a89827aeb3264c42e28353bec1f0e38e47.tar.gz chromium_src-e8af26a89827aeb3264c42e28353bec1f0e38e47.tar.bz2 | |
Calling Shill's ConfigureService instead of GetService for configuring VPN.
BUG=chromium-os:31523
Review URL: https://chromiumcodereview.appspot.com/12039087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_manager_client_unittest.cc')
| -rw-r--r-- | chromeos/dbus/shill_manager_client_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromeos/dbus/shill_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc index a4a241e..e98d62f 100644 --- a/chromeos/dbus/shill_manager_client_unittest.cc +++ b/chromeos/dbus/shill_manager_client_unittest.cc @@ -346,7 +346,10 @@ TEST_F(ShillManagerClientTest, DisableTechnology) { TEST_F(ShillManagerClientTest, ConfigureService) { // Create response. + const dbus::ObjectPath object_path("/"); scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); + dbus::MessageWriter writer(response.get()); + writer.AppendObjectPath(object_path); // Create the argument dictionary. scoped_ptr<base::DictionaryValue> arg(CreateExampleProperties()); // Set expectations. @@ -354,12 +357,11 @@ TEST_F(ShillManagerClientTest, ConfigureService) { base::Bind(&ExpectDictionaryValueArgument, arg.get()), response.get()); // Call method. - MockClosure mock_closure; MockErrorCallback mock_error_callback; client_->ConfigureService(*arg, - mock_closure.GetCallback(), + base::Bind(&ExpectObjectPathResultWithoutStatus, + object_path), mock_error_callback.GetCallback()); - EXPECT_CALL(mock_closure, Run()).Times(1); EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0); // Run the message loop. |