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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/tracing/background_tracing_manager_browsertest.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/browser/tracing/background_tracing_config_impl.cc ('k') | content/browser/tracing/background_tracing_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/background_tracing_manager_browsertest.cc
diff --git a/content/browser/tracing/background_tracing_manager_browsertest.cc b/content/browser/tracing/background_tracing_manager_browsertest.cc
index b387b6236cd7ca8738c6786699217ea1bcbb39d7..e0001b86dd91ae821a3ee03f1db8f6d63c053b43 100644
--- a/content/browser/tracing/background_tracing_manager_browsertest.cc
+++ b/content/browser/tracing/background_tracing_manager_browsertest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/command_line.h"
@@ -107,15 +108,15 @@ scoped_ptr<BackgroundTracingConfig> CreatePreemptiveConfig() {
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
rules_dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
rules_dict->SetString("trigger_name", "preemptive_test");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- return config.Pass();
+ return config;
}
scoped_ptr<BackgroundTracingConfig> CreateReactiveConfig() {
@@ -129,15 +130,15 @@ scoped_ptr<BackgroundTracingConfig> CreateReactiveConfig() {
rules_dict->SetString("rule", "TRACE_ON_NAVIGATION_UNTIL_TRIGGER_OR_FULL");
rules_dict->SetString("trigger_name", "reactive_test");
rules_dict->SetString("category", "BENCHMARK");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- return config.Pass();
+ return config;
}
void SetupBackgroundTracingManager() {
@@ -168,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
GetInstance()->RegisterTriggerType("preemptive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -200,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"preemptive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -255,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::GetInstance()->SetTracingEnabledCallbackForTesting(
wait_for_activated.QuitClosure());
EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::ANONYMIZE_DATA));
wait_for_activated.Run();
@@ -299,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::GetInstance()->SetTracingEnabledCallbackForTesting(
wait_for_activated.QuitClosure());
EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::ANONYMIZE_DATA));
wait_for_activated.Run();
@@ -343,7 +344,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::GetInstance()->SetTracingEnabledCallbackForTesting(
wait_for_activated.QuitClosure());
EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::ANONYMIZE_DATA));
wait_for_activated.Run();
@@ -383,16 +384,16 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
rules_dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
rules_dict->SetString("trigger_name", "test1");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
{
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
rules_dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
rules_dict->SetString("trigger_name", "test2");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
@@ -404,7 +405,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::GetInstance()->RegisterTriggerType("test2");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -442,10 +443,10 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
rules_dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
rules_dict->SetString("trigger_name", "test2");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
dict.SetString("enable_blink_features", "FasterWeb1,FasterWeb2");
dict.SetString("disable_blink_features", "SlowerWeb1,SlowerWeb2");
scoped_ptr<BackgroundTracingConfig> config(
@@ -454,7 +455,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
bool scenario_activated =
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
EXPECT_TRUE(scenario_activated);
@@ -489,10 +490,10 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
rules_dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
rules_dict->SetString("trigger_name", "test2");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
dict.SetString("enable_blink_features", "FasterWeb1,FasterWeb2");
dict.SetString("disable_blink_features", "SlowerWeb1,SlowerWeb2");
scoped_ptr<BackgroundTracingConfig> config(
@@ -504,7 +505,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
bool scenario_activated =
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
EXPECT_FALSE(scenario_activated);
@@ -533,17 +534,17 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
rules_dict->SetString("histogram_name", "fake");
rules_dict->SetInteger("histogram_value", 1);
rules_dict->SetInteger("trigger_delay", 10);
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -619,7 +620,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"does_not_exist");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -655,7 +656,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
->InvalidateTriggerHandlesForTesting();
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -692,9 +693,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
rules_dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
rules_dict->SetString("trigger_name", "preemptive_test");
rules_dict->SetDouble("trigger_chance", 0.0);
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
@@ -706,7 +707,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"preemptive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -745,9 +746,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
rules_dict->SetString("category", "BENCHMARK");
rules_dict->SetDouble("trigger_chance", 0.0);
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
@@ -759,7 +760,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"preemptive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -797,17 +798,17 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"rule", "MONITOR_AND_DUMP_WHEN_SPECIFIC_HISTOGRAM_AND_VALUE");
rules_dict->SetString("histogram_name", "fake");
rules_dict->SetInteger("histogram_value", 1);
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
// Our reference value is "1", so a value of "2" should trigger a trace.
@@ -841,17 +842,17 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"rule", "MONITOR_AND_DUMP_WHEN_SPECIFIC_HISTOGRAM_AND_VALUE");
rules_dict->SetString("histogram_name", "fake");
rules_dict->SetInteger("histogram_value", 1);
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
// This should fail to trigger a trace since the sample value < the
@@ -887,17 +888,17 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
rules_dict->SetString("histogram_name", "fake");
rules_dict->SetInteger("histogram_lower_value", 1);
rules_dict->SetInteger("histogram_upper_value", 3);
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
// This should fail to trigger a trace since the sample value > the
@@ -927,10 +928,10 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
{
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
rules_dict->SetString("rule", "INVALID_RULE");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
@@ -956,7 +957,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
GetInstance()->RegisterTriggerType("reactive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -990,7 +991,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
GetInstance()->RegisterTriggerType("reactive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -1028,7 +1029,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"TRACE_ON_NAVIGATION_UNTIL_TRIGGER_OR_FULL");
rules_dict->SetString("trigger_name", "reactive_test1");
rules_dict->SetString("category", "BENCHMARK");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
{
scoped_ptr<base::DictionaryValue> rules_dict(new base::DictionaryValue());
@@ -1036,9 +1037,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"TRACE_ON_NAVIGATION_UNTIL_TRIGGER_OR_FULL");
rules_dict->SetString("trigger_name", "reactive_test2");
rules_dict->SetString("category", "BENCHMARK");
- rules_list->Append(rules_dict.Pass());
+ rules_list->Append(std::move(rules_dict));
}
- dict.Set("configs", rules_list.Pass());
+ dict.Set("configs", std::move(rules_list));
scoped_ptr<BackgroundTracingConfig> config(
BackgroundTracingConfigImpl::FromDict(&dict));
@@ -1051,7 +1052,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
"reactive_test2");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
@@ -1092,7 +1093,7 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
GetInstance()->RegisterTriggerType("reactive_test");
BackgroundTracingManager::GetInstance()->SetActiveScenario(
- config.Pass(), upload_config_wrapper.get_receive_callback(),
+ std::move(config), upload_config_wrapper.get_receive_callback(),
BackgroundTracingManager::NO_DATA_FILTERING);
BackgroundTracingManager::GetInstance()->WhenIdle(
« no previous file with comments | « content/browser/tracing/background_tracing_config_impl.cc ('k') | content/browser/tracing/background_tracing_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698