Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2119)

Unified Diff: device/bluetooth/bluetooth_uuid.cc

Issue 1172853004: Chromium side of RequestDeviceOptions implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Add an end-namespace comment Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_uuid.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_uuid.cc
diff --git a/device/bluetooth/bluetooth_uuid.cc b/device/bluetooth/bluetooth_uuid.cc
index d5933ccc1cdd32a7ff895031ca2d8ef54179a635..4a0ab22d27ee425c29ec837ae8d51eeac537f6fb 100644
--- a/device/bluetooth/bluetooth_uuid.cc
+++ b/device/bluetooth/bluetooth_uuid.cc
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "ipc/ipc_message.h"
namespace device {
@@ -93,3 +94,27 @@ void PrintTo(const BluetoothUUID& uuid, std::ostream* out) {
}
} // namespace device
+
+void IPC::ParamTraits<device::BluetoothUUID>::Write(Message* m,
+ const param_type& p) {
+ m->WriteString(p.canonical_value());
+}
+
+bool IPC::ParamTraits<device::BluetoothUUID>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
+ std::string value;
+ if (!iter->ReadString(&value))
+ return false;
+ *r = device::BluetoothUUID(value);
+ // If the format isn't 128-bit, .value() would return a different answer than
+ // .canonical_value(). Then if browser-side code accidentally checks .value()
+ // against a 128-bit string literal, a hostile renderer could use the 16- or
+ // 32-bit format and evade the check.
+ return r->format() == device::BluetoothUUID::kFormat128Bit;
+}
+
+void IPC::ParamTraits<device::BluetoothUUID>::Log(const param_type& p,
+ std::string* l) {
+ l->append(p.canonical_value());
+}
« no previous file with comments | « device/bluetooth/bluetooth_uuid.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698