diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-02 20:50:39 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-02 20:50:39 +0000 |
| commit | 66e87ac1b1366736c036faf226fee96da5d9bc8b (patch) | |
| tree | ba9613aaff9d447614af3c270a91f44dbb900543 /chromeos/dbus/shill_manager_client_unittest.cc | |
| parent | fa6496c11220e64cedef64285a186d1e22ccdb51 (diff) | |
| download | chromium_src-66e87ac1b1366736c036faf226fee96da5d9bc8b.zip chromium_src-66e87ac1b1366736c036faf226fee96da5d9bc8b.tar.gz chromium_src-66e87ac1b1366736c036faf226fee96da5d9bc8b.tar.bz2 | |
Rename VerifyAndSign* functions to VerifyAndEncrypt*
since that is a more accurate description (and it's what
the Shill APIs are now named).
(TBR'ing OWNERS because this is a mechanical name change only)
TBR=stevenjb@chromium.org,kalman@chromium.org
BUG=chromium-os:38993,chromium:179193
TEST=built chrome
Review URL: https://chromiumcodereview.appspot.com/12381026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185775 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromeos/dbus/shill_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc index 9ba2dd3..d1730a1 100644 --- a/chromeos/dbus/shill_manager_client_unittest.cc +++ b/chromeos/dbus/shill_manager_client_unittest.cc @@ -454,7 +454,7 @@ TEST_F(ShillManagerClientTest, VerifyDestination) { message_loop_.RunUntilIdle(); } -TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { +TEST_F(ShillManagerClientTest, VerifyAndEncryptCredentials) { // Create response. scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); dbus::MessageWriter writer(response.get()); @@ -469,7 +469,7 @@ TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { arguments.push_back("device_serial"); std::string service_path = "/"; dbus::ObjectPath service_path_obj(service_path); - PrepareForMethodCall(shill::kVerifyAndSignCredentialsFunction, + PrepareForMethodCall(shill::kVerifyAndEncryptCredentialsFunction, base::Bind(&ExpectStringArgumentsFollowedByObjectPath, arguments, service_path_obj), @@ -478,7 +478,7 @@ TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { // Call method. MockErrorCallback mock_error_callback; - client_->VerifyAndSignCredentials(arguments[0], + client_->VerifyAndEncryptCredentials(arguments[0], arguments[1], arguments[2], arguments[3], @@ -493,7 +493,7 @@ TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { message_loop_.RunUntilIdle(); } -TEST_F(ShillManagerClientTest, VerifyAndSignData) { +TEST_F(ShillManagerClientTest, VerifyAndEncryptData) { // Create response. scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); dbus::MessageWriter writer(response.get()); @@ -507,14 +507,14 @@ TEST_F(ShillManagerClientTest, VerifyAndSignData) { arguments.push_back("signed_data"); arguments.push_back("device_serial"); arguments.push_back("data"); - PrepareForMethodCall(shill::kVerifyAndSignDataFunction, + PrepareForMethodCall(shill::kVerifyAndEncryptDataFunction, base::Bind(&ExpectStringArguments, arguments), response.get()); // Call method. MockErrorCallback mock_error_callback; - client_->VerifyAndSignData(arguments[0], + client_->VerifyAndEncryptData(arguments[0], arguments[1], arguments[2], arguments[3], |