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

chrome/browser/metrics/ukm_browsertest.cc

 // Copyright 2017 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 "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"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/sync/test/fake_server/fake_server_network_resources.h"
 #include "components/ukm/public/ukm_recorder.h"
 #include "components/ukm/ukm_service.h"
 #include "content/public/common/content_switches.h"
 
 namespace metrics {
 
 // Test fixture that provides access to some UKM internals.
 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:
   bool ukm_enabled() {
     auto* service = ukm_service();
     return service ? service->recording_enabled_ : false;
   }
   uint64_t client_id() {
     auto* service = ukm_service();
     return service ? service->client_id_ : 0;
@@ skipping 11 matching lines @@
         ProfileSyncServiceHarness::Create(
             profile, "user@gmail.com", "password",
             ProfileSyncServiceHarness::SigninType::FAKE_SIGNIN);
 
     harness->SetupSync();
   }
 
  private:
   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.
 IN_PROC_BROWSER_TEST_F(UkmBrowserTest, IncognitoCheck) {
   // Enable metrics recording and update MetricsServicesManager.
   bool metrics_enabled = true;
   ChromeMetricsServiceAccessor::SetMetricsAndCrashReportingForTesting(
       &metrics_enabled);
   g_browser_process->GetMetricsServicesManager()->UpdateUploadPermissions(
       false);
@@ skipping 12 matching lines @@
   EXPECT_TRUE(ukm_enabled());
   // Client ID should not have been reset.
   EXPECT_EQ(original_client_id, client_id());
 
   ChromeMetricsServiceAccessor::SetMetricsAndCrashReportingForTesting(nullptr);
 }
 
 // TODO(holte): Add more tests to cover multi-profile cases.
 
 }  // namespace metrics