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

chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc

Index: chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc
diff --git a/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc
index 86232126dda57a84839fdc0b4327f15c85f6e080..10eacd35a40c6ee054ff4faa2e395a60ffb0cfc0 100644
--- a/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc
@@ -7,6 +7,8 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
+#include "base/test/scoped_feature_list.h"
+#include "chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/common/content_switches.h"
@@ -16,22 +18,23 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-const char kAdsMetricsFeature[] = "AdsMetrics";
-
 class AdsPageLoadMetricsObserverBrowserTest : public InProcessBrowserTest {
  public:
-  AdsPageLoadMetricsObserverBrowserTest() {
-    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-    cmd_line->AppendSwitchASCII(switches::kEnableFeatures, kAdsMetricsFeature);
-  }
+  AdsPageLoadMetricsObserverBrowserTest() {}
+
   ~AdsPageLoadMetricsObserverBrowserTest() override {}
 
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    scoped_feature_list_.InitAndEnableFeature(features::kAdsFeature);

[Ilya Sherman, 2017/06/12 21:50:29]

Why are you doing this during SetUpCommandLine, rather than -- say -- during the
test constructor?

[chaopeng, 2017/06/28 19:21:24]

Moved to SetUp.

+  }
+
   void SetUpOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->Start());
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
   DISALLOW_COPY_AND_ASSIGN(AdsPageLoadMetricsObserverBrowserTest);
 };