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

Unified Diff: chrome/browser/extensions/api/copresence/copresence_api_unittest.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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: chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
index 110a503a30982f23d6354768ec32903f157e84a2..ff79a4c7104ad77a5800fc0a293694076a9a3be9 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api_unittest.cc
@@ -2,9 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/extensions/api/copresence/copresence_api.h"
+
+#include <utility>
+
#include "base/json/json_writer.h"
#include "base/values.h"
-#include "chrome/browser/extensions/api/copresence/copresence_api.h"
#include "chrome/browser/extensions/extension_api_unittest.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "components/copresence/proto/data.pb.h"
@@ -120,8 +123,8 @@ class CopresenceApiUnittest : public ExtensionApiUnittest {
function->set_extension(extension());
function->set_browser_context(profile());
function->set_has_callback(true);
- test_utils::RunFunction(
- function.get(), args_list.Pass(), browser(), test_utils::NONE);
+ test_utils::RunFunction(function.get(), std::move(args_list), browser(),
+ test_utils::NONE);
return function->GetResultList();
}
@@ -157,10 +160,10 @@ TEST_F(CopresenceApiUnittest, Publish) {
publish->strategies->only_broadcast.reset(new bool(true)); // Default
scoped_ptr<Operation> operation(new Operation);
- operation->publish = publish.Pass();
+ operation->publish = std::move(publish);
clear_app_id();
- EXPECT_TRUE(ExecuteOperation(operation.Pass()));
+ EXPECT_TRUE(ExecuteOperation(std::move(operation)));
EXPECT_EQ(extension()->id(), app_id_sent());
PublishedMessage message;
@@ -184,10 +187,10 @@ TEST_F(CopresenceApiUnittest, Subscribe) {
subscribe->strategies->audible.reset(new bool(true)); // Not default
scoped_ptr<Operation> operation(new Operation);
- operation->subscribe = subscribe.Pass();
+ operation->subscribe = std::move(subscribe);
clear_app_id();
- EXPECT_TRUE(ExecuteOperation(operation.Pass()));
+ EXPECT_TRUE(ExecuteOperation(std::move(operation)));
EXPECT_EQ(extension()->id(), app_id_sent());
Subscription subscription;
@@ -281,7 +284,7 @@ TEST_F(CopresenceApiUnittest, BadId) {
unsubscribe_operation->unsubscribe.reset(new UnsubscribeOperation);
unsubscribe_operation->unsubscribe->unsubscribe_id = "invalid id";
- EXPECT_FALSE(ExecuteOperation(unsubscribe_operation.Pass()));
+ EXPECT_FALSE(ExecuteOperation(std::move(unsubscribe_operation)));
}
TEST_F(CopresenceApiUnittest, MultipleOperations) {
@@ -289,7 +292,7 @@ TEST_F(CopresenceApiUnittest, MultipleOperations) {
multi_operation->publish.reset(CreatePublish("pub"));
multi_operation->subscribe.reset(CreateSubscribe("sub"));
- EXPECT_FALSE(ExecuteOperation(multi_operation.Pass()));
+ EXPECT_FALSE(ExecuteOperation(std::move(multi_operation)));
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698