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

Unified Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_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/activity_log_private/activity_log_private_api_unittest.cc
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
index dfdf3cb1fd9a96c6aac265c7c59133f6b7840ea4..4417aa87eb6fd421c232be850560358e32eef31f 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
@@ -2,12 +2,14 @@
// 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/activity_log_private/activity_log_private_api.h"
+
#include <string>
+#include <utility>
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/activity_log/activity_action_constants.h"
-#include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -32,7 +34,7 @@ TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
base::Time::Now(),
Action::ACTION_API_CALL,
kApiCall));
- action->set_args(args.Pass());
+ action->set_args(std::move(args));
scoped_ptr<ExtensionActivity> result = action->ConvertToExtensionActivity();
ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_TYPE_API_CALL,
result->activity_type);
@@ -51,7 +53,7 @@ TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
Action::ACTION_DOM_ACCESS,
kApiCall,
12345));
- action->set_args(args.Pass());
+ action->set_args(std::move(args));
action->set_page_url(GURL("http://www.google.com"));
action->set_page_title("Title");
action->mutable_other()->SetInteger(activity_log_constants::kActionDomVerb,
@@ -64,7 +66,7 @@ TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
ASSERT_EQ("Title", *(result->page_title.get()));
ASSERT_EQ(kApiCall, *(result->api_call.get()));
ASSERT_EQ(kArgs, *(result->args.get()));
- scoped_ptr<ExtensionActivity::Other> other(result->other.Pass());
+ scoped_ptr<ExtensionActivity::Other> other(std::move(result->other));
ASSERT_EQ(api::activity_log_private::EXTENSION_ACTIVITY_DOM_VERB_INSERTED,
other->dom_verb);
ASSERT_TRUE(other->prerender.get());

Powered by Google App Engine
This is Rietveld 408576698