[Cleanup] Move all browsertests to use ScopedFeatureList to modify features

chrome/browser/metrics/ukm_browsertest.cc

Index: chrome/browser/metrics/ukm_browsertest.cc
diff --git a/chrome/browser/metrics/ukm_browsertest.cc b/chrome/browser/metrics/ukm_browsertest.cc
index c11834d2ceaa67e8c9f6d5fe7638e4c34012f8d4..53f2ff6e133457dfcc740da75fdf9077b5995a45 100644
--- a/chrome/browser/metrics/ukm_browsertest.cc
+++ b/chrome/browser/metrics/ukm_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -23,10 +24,9 @@ class UkmBrowserTest : public SyncTest {
  public:
   UkmBrowserTest() : SyncTest(SINGLE_CLIENT) {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    SyncTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    ukm::kUkmFeature.name);
+  void SetUp() override {
+    scoped_feature_list_.InitAndEnableFeature(ukm::kUkmFeature);
+    SyncTest::SetUp();
   }
 
  protected:
@@ -59,6 +59,7 @@ class UkmBrowserTest : public SyncTest {
   ukm::UkmService* ukm_service() {
     return static_cast<ukm::UkmService*>(ukm::UkmRecorder::Get());
   }

[Ilya Sherman, 2017/06/28 19:56:05]

nit: Please leave a blank line here.

[chaopeng, 2017/06/30 19:32:36]

Done.

+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 // Make sure that UKM is disabled while an incognito window is open.