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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/activity_log/counting_policy_unittest.cc

Issue 503903004: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/activity_log/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: timeout insurance Created 6 years, 4 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/browser/extensions/activity_log/counting_policy.cc ('k') | chrome/browser/extensions/activity_log/fullstream_ui_policy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/activity_log/counting_policy_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index 371b913e07a660d1a01a05a5ed1e176caf32f6cc..7ec05cf7d5b1c6fdd6cc304a7124f368d552c5ea 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -183,37 +183,84 @@ class CountingPolicyTest : public testing::Test {
static void Arguments_Stripped(scoped_ptr<Action::ActionVector> i) {
scoped_refptr<Action> last = i->front();
- CheckAction(*last, "odlameecjipmbmbejkplpemijjgpljce",
- Action::ACTION_API_CALL, "extension.connect",
- "[\"hello\",\"world\"]", "", "", "", 1);
+ CheckAction(*last.get(),
+ "odlameecjipmbmbejkplpemijjgpljce",
+ Action::ACTION_API_CALL,
+ "extension.connect",
+ "[\"hello\",\"world\"]",
+ "",
+ "",
+ "",
+ 1);
}
static void Arguments_GetSinglesAction(
scoped_ptr<Action::ActionVector> actions) {
ASSERT_EQ(1, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "http://www.google.com/", "", "", 1);
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "http://www.google.com/",
+ "",
+ "",
+ 1);
}
static void Arguments_GetTodaysActions(
scoped_ptr<Action::ActionVector> actions) {
ASSERT_EQ(3, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0), "punky", Action::ACTION_API_CALL, "brewster",
- "", "", "", "", 2);
- CheckAction(*actions->at(1), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "http://www.google.com/", "", "", 1);
- CheckAction(*actions->at(2), "punky", Action::ACTION_API_CALL,
- "extension.sendMessage", "[\"not\",\"stripped\"]", "", "", "",
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_API_CALL,
+ "brewster",
+ "",
+ "",
+ "",
+ "",
+ 2);
+ CheckAction(*actions->at(1).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "http://www.google.com/",
+ "",
+ "",
+ 1);
+ CheckAction(*actions->at(2).get(),
+ "punky",
+ Action::ACTION_API_CALL,
+ "extension.sendMessage",
+ "[\"not\",\"stripped\"]",
+ "",
+ "",
+ "",
1);
}
static void Arguments_GetOlderActions(
scoped_ptr<Action::ActionVector> actions) {
ASSERT_EQ(2, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "http://www.google.com/", "", "", 1);
- CheckAction(*actions->at(1), "punky", Action::ACTION_API_CALL, "brewster",
- "", "", "", "", 1);
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "http://www.google.com/",
+ "",
+ "",
+ 1);
+ CheckAction(*actions->at(1).get(),
+ "punky",
+ Action::ACTION_API_CALL,
+ "brewster",
+ "",
+ "",
+ "",
+ "",
+ 1);
}
static void Arguments_CheckMergeCount(
@@ -221,8 +268,15 @@ class CountingPolicyTest : public testing::Test {
scoped_ptr<Action::ActionVector> actions) {
if (count > 0) {
ASSERT_EQ(1u, actions->size());
- CheckAction(*actions->at(0), "punky", Action::ACTION_API_CALL, "brewster",
- "", "", "", "", count);
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_API_CALL,
+ "brewster",
+ "",
+ "",
+ "",
+ "",
+ count);
} else {
ASSERT_EQ(0u, actions->size());
}
@@ -234,8 +288,15 @@ class CountingPolicyTest : public testing::Test {
scoped_ptr<Action::ActionVector> actions) {
if (count > 0) {
ASSERT_EQ(1u, actions->size());
- CheckAction(*actions->at(0), "punky", Action::ACTION_API_CALL, "brewster",
- "", "", "", "", count);
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_API_CALL,
+ "brewster",
+ "",
+ "",
+ "",
+ "",
+ count);
ASSERT_EQ(time, actions->at(0)->time());
} else {
ASSERT_EQ(0u, actions->size());
@@ -244,26 +305,74 @@ class CountingPolicyTest : public testing::Test {
static void AllURLsRemoved(scoped_ptr<Action::ActionVector> actions) {
ASSERT_EQ(2, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "", "", "", 1);
- CheckAction(*actions->at(1), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "", "", "", 1);
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "",
+ "",
+ "",
+ 1);
+ CheckAction(*actions->at(1).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "",
+ "",
+ "",
+ 1);
}
static void SomeURLsRemoved(scoped_ptr<Action::ActionVector> actions) {
// These will be in the vector in reverse time order.
ASSERT_EQ(5, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "http://www.google.com/", "Google",
- "http://www.args-url.com/", 1);
- CheckAction(*actions->at(1), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "http://www.google.com/", "Google", "", 1);
- CheckAction(*actions->at(2), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "", "", "", 1);
- CheckAction(*actions->at(3), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "", "", "http://www.google.com/", 1);
- CheckAction(*actions->at(4), "punky", Action::ACTION_DOM_ACCESS, "lets",
- "", "", "", "", 1);
+ CheckAction(*actions->at(0).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "http://www.google.com/",
+ "Google",
+ "http://www.args-url.com/",
+ 1);
+ CheckAction(*actions->at(1).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "http://www.google.com/",
+ "Google",
+ "",
+ 1);
+ CheckAction(*actions->at(2).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "",
+ "",
+ "",
+ 1);
+ CheckAction(*actions->at(3).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "",
+ "",
+ "http://www.google.com/",
+ 1);
+ CheckAction(*actions->at(4).get(),
+ "punky",
+ Action::ACTION_DOM_ACCESS,
+ "lets",
+ "",
+ "",
+ "",
+ "",
+ 1);
}
static void CheckDuplicates(scoped_ptr<Action::ActionVector> actions) {
@@ -357,7 +466,7 @@ class CountingPolicyTest : public testing::Test {
static void NoActionsDeleted(scoped_ptr<Action::ActionVector> actions) {
// These will be in the vector in reverse time order.
ASSERT_EQ(2, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0),
+ CheckAction(*actions->at(0).get(),
"punky2",
Action::ACTION_API_CALL,
"lets2",
@@ -367,7 +476,7 @@ class CountingPolicyTest : public testing::Test {
"http://www.args-url2.com/",
2);
ASSERT_EQ(2, actions->at(0)->action_id());
- CheckAction(*actions->at(1),
+ CheckAction(*actions->at(1).get(),
"punky1",
Action::ACTION_DOM_ACCESS,
"lets1",
@@ -382,7 +491,7 @@ class CountingPolicyTest : public testing::Test {
static void Action1Deleted(scoped_ptr<Action::ActionVector> actions) {
// These will be in the vector in reverse time order.
ASSERT_EQ(1, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0),
+ CheckAction(*actions->at(0).get(),
"punky2",
Action::ACTION_API_CALL,
"lets2",
@@ -397,7 +506,7 @@ class CountingPolicyTest : public testing::Test {
static void Action2Deleted(scoped_ptr<Action::ActionVector> actions) {
// These will be in the vector in reverse time order.
ASSERT_EQ(1, static_cast<int>(actions->size()));
- CheckAction(*actions->at(0),
+ CheckAction(*actions->at(0).get(),
"punky1",
Action::ACTION_DOM_ACCESS,
"lets1",
« no previous file with comments | « chrome/browser/extensions/activity_log/counting_policy.cc ('k') | chrome/browser/extensions/activity_log/fullstream_ui_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698