Convert FieldTrialList to Accept a std::unique_ptr

chrome/browser/memory/tab_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/memory/tab_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #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"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/memory/tab_manager_web_contents_data.h"
 #include "chrome/browser/memory/tab_stats.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
@@ skipping 435 matching lines @@
   // Not setting the variation parameter.
   {
     bool discard_once_value = tab_manager.CanOnlyDiscardOnce();
     EXPECT_TRUE(discard_once_value);
   }
 
   // Setting the variation parameter to true.
   {
     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;
     params["AllowMultipleDiscards"] = "true";
     ASSERT_TRUE(variations::AssociateVariationParams(kTrialName, "A", params));
     base::FieldTrialList::CreateFieldTrial(kTrialName, "A");
 
     bool discard_once_value = tab_manager.CanOnlyDiscardOnce();
     EXPECT_FALSE(discard_once_value);
   }
 
   // Setting the variation parameter to something else.
   {
     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;
     params["AllowMultipleDiscards"] = "somethingElse";
     ASSERT_TRUE(variations::AssociateVariationParams(kTrialName, "B", params));
     base::FieldTrialList::CreateFieldTrial(kTrialName, "B");
 
     bool discard_once_value = tab_manager.CanOnlyDiscardOnce();
     EXPECT_TRUE(discard_once_value);
   }
@@ skipping 166 matching lines @@
   EXPECT_EQ(0u, task_runner->size());
   EXPECT_EQ(0u, tm.notified_renderers_.size());
 
 
   // Clean up the tabstrip.
   tabstrip.CloseAllTabs();
   ASSERT_TRUE(tabstrip.empty());
 }
 
 }  // namespace memory