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

Unified Diff: extensions/browser/api/display_source/display_source_apitest.cc

Issue 1841483002: [Extensions] Convert APIs to use movable types [11] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: extensions/browser/api/display_source/display_source_apitest.cc
diff --git a/extensions/browser/api/display_source/display_source_apitest.cc b/extensions/browser/api/display_source/display_source_apitest.cc
index dc7e9ef37bb2225ebb00b62b0aa284e091a192c5..01419f3dec46cc9ead2db684148b9cba62ff9259 100644
--- a/extensions/browser/api/display_source/display_source_apitest.cc
+++ b/extensions/browser/api/display_source/display_source_apitest.cc
@@ -17,15 +17,15 @@ using api::display_source::AUTHENTICATION_METHOD_PBC;
namespace {
-DisplaySourceSinkInfoPtr CreateSinkInfoPtr(int id,
- const std::string& name,
- SinkState state) {
- DisplaySourceSinkInfoPtr ptr(new SinkInfo());
- ptr->id = id;
- ptr->name = name;
- ptr->state = state;
-
- return ptr;
+DisplaySourceSinkInfo CreateSinkInfoPtr(int id,
+ const std::string& name,
+ SinkState state) {
+ DisplaySourceSinkInfo info;
+ info.id = id;
+ info.name = name;
+ info.state = state;
+
+ return info;
}
} // namespace
@@ -33,7 +33,9 @@ DisplaySourceSinkInfoPtr CreateSinkInfoPtr(int id,
class MockDisplaySourceConnectionDelegate
: public DisplaySourceConnectionDelegate {
public:
- DisplaySourceSinkInfoList last_found_sinks() const override { return sinks_; }
+ const DisplaySourceSinkInfoList& last_found_sinks() const override {
+ return sinks_;
+ }
const Connection* connection() const override { return nullptr; }
void GetAvailableSinks(const SinkInfoListCallback& sinks_callback,
const StringCallback& failure_callback) override {
@@ -62,8 +64,8 @@ class MockDisplaySourceConnectionDelegate
void StopWatchingAvailableSinks() override {}
private:
- void AddSink(DisplaySourceSinkInfoPtr sink) {
- sinks_.push_back(sink);
+ void AddSink(DisplaySourceSinkInfo sink) {
+ sinks_.push_back(std::move(sink));
FOR_EACH_OBSERVER(DisplaySourceConnectionDelegate::Observer, observers_,
OnSinksUpdated(sinks_));
}

Powered by Google App Engine
This is Rietveld 408576698