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

chrome/browser/chromeos/extensions/input_method_apitest_chromeos.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/extensions/extension_apitest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
+#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/browser/api/test/test_api.h"
@@ skipping 48 matching lines @@
       manager->GetActiveIMEState()->EnableLoginLayouts(kLoginScreenUILanguage,
                                                        keyboard_layouts);
     }
   }
 
  private:
   content::NotificationRegistrar registrar_;
 };
 
 class ExtensionInputMethodApiTest : public ExtensionApiTest {
+ public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         extensions::switches::kWhitelistedExtensionID,
         "ilanclmaeigfpnmdlgelmhkpkegdioip");
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    features::kOptInImeMenu.name);
+    scoped_feature_list_.InitAndEnableFeature(features::kOptInImeMenu);

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

Does this need to be done as part of SetUpCommandLine?  Could it happen during
SetUp() instead?  SetUpCommandLine() is a much more specialized method, and I'd
prefer to minimize the amount of code in it, for clarity.

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

Move all calls to SetUp

   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) {
   // Listener for extension's background ready.
   TestListener listener;
 
   ASSERT_TRUE(RunExtensionTest("input_method/basic")) << message_;
 }
@@ skipping 47 matching lines @@
 
   ASSERT_TRUE(activated_listener.WaitUntilSatisfied()) << message_;
   ASSERT_TRUE(menu_listener.WaitUntilSatisfied()) << message_;
   ASSERT_TRUE(item_activated_listenter.WaitUntilSatisfied()) << message_;
 
   InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
       kTestIMEID2, false /* show_message */);
   engine_handler->Enable("test2");
   ASSERT_TRUE(list_listenter.WaitUntilSatisfied()) << message_;
 }