diff options
| author | vadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 00:03:33 +0000 |
|---|---|---|
| committer | vadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 00:03:33 +0000 |
| commit | 1d4b7c7ca38a12faaf5b8878428f57b4896c1496 (patch) | |
| tree | 0292489017b8ce80fab92daf4dafe2f4a54fbd3e /jingle | |
| parent | 9a07c2959da5398a6dd9176e1bbf31f6ab6dc89a (diff) | |
| download | chromium_src-1d4b7c7ca38a12faaf5b8878428f57b4896c1496.zip chromium_src-1d4b7c7ca38a12faaf5b8878428f57b4896c1496.tar.gz chromium_src-1d4b7c7ca38a12faaf5b8878428f57b4896c1496.tar.bz2 | |
Revert 239759 "The comment in base64.h implies that base::Base64..."
> The comment in base64.h implies that base::Base64Encode() can return false, but
> this cannot happen in practice. Fix the comment.
>
> The implementation of Base64Encode() attempts to check for the return value
> MODP_B64_ERROR as a failure, but modp_b64_encode() cannot return this
> value. Remove the check.
>
> Remove unneeded integer cast.
>
> Change the return type to void.
>
> BUG=323357
> TEST=base_unittests, compile all
> TBR=jochen@chromium.org,miket@chromium.org,joi@chromium.org,akalin@chromium.org,sergeyu@chromium.org
>
> Review URL: https://codereview.chromium.org/86913002
TBR=ricea@chromium.org
Review URL: https://codereview.chromium.org/101113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/listener/push_notifications_send_update_task.cc | 12 | ||||
| -rw-r--r-- | jingle/notifier/listener/push_notifications_send_update_task_unittest.cc | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/jingle/notifier/listener/push_notifications_send_update_task.cc b/jingle/notifier/listener/push_notifications_send_update_task.cc index 9b5abb6..4e0c127 100644 --- a/jingle/notifier/listener/push_notifications_send_update_task.cc +++ b/jingle/notifier/listener/push_notifications_send_update_task.cc @@ -71,14 +71,20 @@ buzz::XmlElement* PushNotificationsSendUpdateTask::MakeUpdateMessage( recipient_element->AddAttr(buzz::QN_TO, recipient.to); if (!recipient.user_specific_data.empty()) { std::string base64_data; - base::Base64Encode(recipient.user_specific_data, &base64_data); - recipient_element->SetBodyText(base64_data); + if (!base::Base64Encode(recipient.user_specific_data, &base64_data)) { + DLOG(WARNING) << "Could not encode data " + << recipient.user_specific_data; + } else { + recipient_element->SetBodyText(base64_data); + } } } buzz::XmlElement* data = new buzz::XmlElement(kQnData, true); std::string base64_data; - base::Base64Encode(notification.data, &base64_data); + if (!base::Base64Encode(notification.data, &base64_data)) { + DLOG(WARNING) << "Could not encode data " << notification.data; + } data->SetBodyText(base64_data); push->AddElement(data); diff --git a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc index 0395352..c57bd93 100644 --- a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc +++ b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc @@ -36,7 +36,7 @@ TEST_F(PushNotificationsSendUpdateTaskTest, MakeUpdateMessage) { notification.data = "test_data"; std::string base64_data; - base::Base64Encode(notification.data, &base64_data); + EXPECT_TRUE(base::Base64Encode(notification.data, &base64_data)); scoped_ptr<buzz::XmlElement> message( PushNotificationsSendUpdateTask::MakeUpdateMessage( |