1 files changed, 15 insertions, 8 deletions
diff --git a/chromium/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc b/chromium/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
index 33042b32456..3e6af3e0cc7 100644
--- a/chromium/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
+++ b/chromium/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
@@ -33,7 +33,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, UserLevelNativeMessaging) {
 
 class TestProcessManagerObserver : public ProcessManagerObserver {
  public:
-  TestProcessManagerObserver() : observer_(this) {}
+  TestProcessManagerObserver() = default;
+  ~TestProcessManagerObserver() override = default;
 
   void WaitForProcessShutdown(ProcessManager* process_manager,
                               const std::string& extension_id) {
@@ -57,21 +58,29 @@ class TestProcessManagerObserver : public ProcessManagerObserver {
   }
 
   std::string extension_id_;
-  ScopedObserver<ProcessManager, TestProcessManagerObserver> observer_;
+  ScopedObserver<ProcessManager, ProcessManagerObserver> observer_{this};
   base::OnceClosure quit_;
 
   DISALLOW_COPY_AND_ASSIGN(TestProcessManagerObserver);
 };
 
+class NativeMessagingApiTest : public ExtensionApiTest {
+ public:
+  NativeMessagingApiTest() {
+    feature_list_.InitAndEnableFeature(features::kOnConnectNative);
+  }
+
+ private:
+  base::test::ScopedFeatureList feature_list_;
+};
+
 // Disabled on Windows due to timeouts; see https://crbug.com/984897.
 #if defined(OS_WIN)
 #define MAYBE_NativeMessagingLaunch DISABLED_NativeMessagingLaunch
 #else
 #define MAYBE_NativeMessagingLaunch NativeMessagingLaunch
 #endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_NativeMessagingLaunch) {
-  base::test::ScopedFeatureList features;
-  features.InitAndEnableFeature(features::kOnConnectNative);
+IN_PROC_BROWSER_TEST_F(NativeMessagingApiTest, MAYBE_NativeMessagingLaunch) {
   ProcessManager::SetEventPageIdleTimeForTesting(1);
   ProcessManager::SetEventPageSuspendingTimeForTesting(1);
   extensions::ScopedTestNativeMessagingHost test_host;
@@ -112,10 +121,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_NativeMessagingLaunch) {
 // natively-initiated connections is not allowed. The test extension expects the
 // channel to be immediately closed with an error.
 IN_PROC_BROWSER_TEST_F(
-    ExtensionApiTest,
+    NativeMessagingApiTest,
     NativeMessagingLaunch_LaunchFromNativeUnsupportedByNativeHost) {
-  base::test::ScopedFeatureList features;
-  features.InitAndEnableFeature(features::kOnConnectNative);
   ProcessManager::SetEventPageIdleTimeForTesting(1);
   ProcessManager::SetEventPageSuspendingTimeForTesting(1);
   extensions::ScopedTestNativeMessagingHost test_host;