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

Unified Diff: chrome/renderer/media/cast_session_delegate.cc

Issue 2689673002: Inline base::BinaryValue into base::Value (Closed)
Patch Set: Rebase Created 3 years, 10 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 | « chrome/renderer/media/cast_session_delegate.h ('k') | chromecast/base/serializers_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/media/cast_session_delegate.cc
diff --git a/chrome/renderer/media/cast_session_delegate.cc b/chrome/renderer/media/cast_session_delegate.cc
index b76f34c4c5a6d7347ad4ed22e434572cbbbdf246..1216f2a238042d361989de12d0d84e6fe913d52f 100644
--- a/chrome/renderer/media/cast_session_delegate.cc
+++ b/chrome/renderer/media/cast_session_delegate.cc
@@ -6,6 +6,7 @@
#include <memory>
#include <utility>
+#include <vector>
#include "base/callback_helpers.h"
#include "base/lazy_instance.h"
@@ -207,14 +208,14 @@ void CastSessionDelegate::GetEventLogsAndReset(
DCHECK(io_task_runner_->BelongsToCurrentThread());
if (!event_subscribers_.get()) {
- callback.Run(base::MakeUnique<base::BinaryValue>());
+ callback.Run(base::MakeUnique<base::Value>(base::Value::Type::BINARY));
return;
}
media::cast::EncodingEventSubscriber* subscriber =
event_subscribers_->GetEncodingEventSubscriber(is_audio);
if (!subscriber) {
- callback.Run(base::MakeUnique<base::BinaryValue>());
+ callback.Run(base::MakeUnique<base::Value>(base::Value::Type::BINARY));
return;
}
@@ -245,14 +246,14 @@ void CastSessionDelegate::GetEventLogsAndReset(
if (!success) {
DVLOG(2) << "Failed to serialize event log.";
- callback.Run(base::MakeUnique<base::BinaryValue>());
+ callback.Run(base::MakeUnique<base::Value>(base::Value::Type::BINARY));
return;
}
DVLOG(2) << "Serialized log length: " << output_bytes;
- std::unique_ptr<base::BinaryValue> blob(
- new base::BinaryValue(std::move(serialized_log), output_bytes));
+ auto blob = base::MakeUnique<base::BinaryValue>(std::vector<char>(
+ serialized_log.get(), serialized_log.get() + output_bytes));
callback.Run(std::move(blob));
}
« no previous file with comments | « chrome/renderer/media/cast_session_delegate.h ('k') | chromecast/base/serializers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698