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

Unified Diff: chrome/browser/memory/tab_manager_unittest.cc

Issue 2358723002: Convert FieldTrialList to Accept a std::unique_ptr (Closed)
Patch Set: Change Comment nullptr to null Created 4 years, 3 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: chrome/browser/memory/tab_manager_unittest.cc
diff --git a/chrome/browser/memory/tab_manager_unittest.cc b/chrome/browser/memory/tab_manager_unittest.cc
index 207aac9e07b4834642e7b97e29b6195389f16792..52f6141897e5ab18522163ba820610a3535e2ed6 100644
--- a/chrome/browser/memory/tab_manager_unittest.cc
+++ b/chrome/browser/memory/tab_manager_unittest.cc
@@ -10,6 +10,8 @@
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/metrics/field_trial.h"
#include "base/strings/string16.h"
#include "base/test/mock_entropy_provider.h"
#include "base/test/simple_test_tick_clock.h"
@@ -465,7 +467,8 @@ TEST_F(TabManagerTest, CanOnlyDiscardOnce) {
{
std::unique_ptr<base::FieldTrialList> field_trial_list_;
field_trial_list_.reset(
- new base::FieldTrialList(new base::MockEntropyProvider()));
+ new base::FieldTrialList(
+ base::MakeUnique<base::MockEntropyProvider>()));
variations::testing::ClearAllVariationParams();
std::map<std::string, std::string> params;
@@ -481,7 +484,8 @@ TEST_F(TabManagerTest, CanOnlyDiscardOnce) {
{
std::unique_ptr<base::FieldTrialList> field_trial_list_;
field_trial_list_.reset(
- new base::FieldTrialList(new base::MockEntropyProvider()));
+ new base::FieldTrialList(
+ base::MakeUnique<base::MockEntropyProvider>()));
variations::testing::ClearAllVariationParams();
std::map<std::string, std::string> params;
« no previous file with comments | « chrome/browser/io_thread_unittest.cc ('k') | chrome/browser/permissions/permission_context_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698