Refactor enterprise.deviceAttributes API test

This CL refactors large parts of the EnterpriseDeviceAttributesApiTest
class into a new ForceInstalledAffiliatedExtensionApiTest class that
can be shared for the enterprise.deviceAttributes API test and the new
enterprise.networkingAttributes API test.
The parameterized test class takes care of setting up a
affiliated/non-affiliated (based on parameter) user and force-installs
the specified extension.

Bug: 1081333
Change-Id: Ic3c73c36dfe9e5cbff02d31e05099eca38eba42d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2196669
Commit-Queue: Alexander Hendrich <hendrich@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770533}

chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

@@ -2,38 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <memory>
-
-#include "base/bind.h"
-#include "base/json/json_writer.h"
-#include "base/path_service.h"
-#include "base/task/post_task.h"
+#include "base/files/file_path.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/affiliation_test_helper.h"
-#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
+#include "chrome/browser/chromeos/policy/device_policy_builder.h"
+#include "chrome/browser/extensions/api/force_installed_affiliated_extension_apitest.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/policy_test_utils.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/dbus/session_manager/fake_session_manager_client.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "chromeos/system/statistics_provider.h"
-#include "chromeos/tpm/stub_install_attributes.h"
-#include "components/account_id/account_id.h"
-#include "components/policy/core/common/cloud/device_management_service.h"
-#include "components/policy/core/common/mock_configuration_policy_provider.h"
-#include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
-#include "extensions/browser/api_test_utils.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/test/result_catcher.h"
+#include "url/gurl.h"
 
 namespace {
 
@@ -42,30 +25,10 @@ constexpr char kSerialNumber[] = "serial_number";
 constexpr char kAssetId[] = "asset_id";
 constexpr char kAnnotatedLocation[] = "annotated_location";
 constexpr char kHostname[] = "hostname";
-constexpr char kUpdateManifestPath[] =
-    "/extensions/api_test/enterprise_device_attributes/update_manifest.xml";
 
-constexpr char kAffiliatedUserEmail[] = "user@example.com";
-constexpr char kAffiliatedUserGaiaId[] = "1029384756";
-constexpr char kAffiliationID[] = "some-affiliation-id";
-constexpr char kAnotherAffiliationID[] = "another-affiliation-id";
-
-// The managed_storage extension has a key defined in its manifest, so that
-// its extension ID is well-known and the policy system can push policies for
-// the extension.
 constexpr char kTestExtensionID[] = "nbiliclbejdndfpchgkbmfoppjplbdok";
-
-struct Params {
-  explicit Params(bool affiliated) : affiliated(affiliated) {}
-  bool affiliated;
-};
-
-// Must be a valid test name (no spaces etc.). Makes the test show up as e.g.
-// AffiliationCheck/U.A.B.T.Affiliated/NotAffiliated_NotActiveDirectory
-std::string PrintParam(testing::TestParamInfo<Params> param_info) {
-  return base::StringPrintf("%sAffiliated",
-                            param_info.param.affiliated ? "" : "Not");
-}
+constexpr char kUpdateManifestPath[] =
+    "/extensions/api_test/enterprise_device_attributes/update_manifest.xml";
 
 base::Value BuildCustomArg(const std::string& expected_directory_device_id,
                            const std::string& expected_serial_number,
@@ -89,49 +52,21 @@ base::Value BuildCustomArg(const std::string& expected_directory_device_id,
 namespace extensions {
 
 class EnterpriseDeviceAttributesTest
-    : public ExtensionApiTest,
-      public ::testing::WithParamInterface<Params> {
+    : public ForceInstalledAffiliatedExtensionApiTest,
+      public ::testing::WithParamInterface<bool> {
  public:
-  EnterpriseDeviceAttributesTest() {
+  EnterpriseDeviceAttributesTest()
+      : ForceInstalledAffiliatedExtensionApiTest(GetParam()) {
     fake_statistics_provider_.SetMachineStatistic(
         chromeos::system::kSerialNumberKeyForTest, kSerialNumber);
-    set_exit_when_last_browser_closes(false);
-    set_chromeos_user_ = false;
   }
 
  protected:
-  // ExtensionApiTest
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    ExtensionApiTest::SetUpCommandLine(command_line);
-    policy::AffiliationTestHelper::AppendCommandLineSwitchesForLoginManager(
-        command_line);
-  }
-
+  // ForceInstalledAffiliatedExtensionApiTest
   void SetUpInProcessBrowserTestFixture() override {
-    ExtensionApiTest::SetUpInProcessBrowserTestFixture();
-
-    chromeos::SessionManagerClient::InitializeFakeInMemory();
-    policy::AffiliationTestHelper affiliation_helper =
-        policy::AffiliationTestHelper::CreateForCloud(
-            chromeos::FakeSessionManagerClient::Get());
-
-    std::set<std::string> device_affiliation_ids;
-    device_affiliation_ids.insert(kAffiliationID);
-    ASSERT_NO_FATAL_FAILURE(affiliation_helper.SetDeviceAffiliationIDs(
-        &test_helper_, device_affiliation_ids));
-    test_helper_.InstallOwnerKey();
+    ForceInstalledAffiliatedExtensionApiTest::
+        SetUpInProcessBrowserTestFixture();
 
-    std::set<std::string> user_affiliation_ids;
-    if (GetParam().affiliated) {
-      user_affiliation_ids.insert(kAffiliationID);
-    } else {
-      user_affiliation_ids.insert(kAnotherAffiliationID);
-    }
-    policy::UserPolicyBuilder user_policy;
-    ASSERT_NO_FATAL_FAILURE(affiliation_helper.SetUserAffiliationIDs(
-        &user_policy, affiliated_account_id_, user_affiliation_ids));
-
-    test_helper_.InstallOwnerKey();
     // Init the device policy.
     policy::DevicePolicyBuilder* device_policy = test_helper_.device_policy();
     device_policy->SetDefaultSigningKey();
@@ -146,67 +81,9 @@ class EnterpriseDeviceAttributesTest
     chromeos::FakeSessionManagerClient::Get()->set_device_policy(
         device_policy->GetBlob());
     chromeos::FakeSessionManagerClient::Get()->OnPropertyChangeComplete(true);
-
-    // Init the user policy provider.
-    EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
-        .WillRepeatedly(testing::Return(true));
-    policy_provider_.SetAutoRefresh();
-    policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
-        &policy_provider_);
-
-    // Set retry delay to prevent timeouts.
-    policy::DeviceManagementService::SetRetryDelayForTesting(0);
   }
 
-  void SetUpOnMainThread() override {
-    const base::ListValue* users =
-        g_browser_process->local_state()->GetList("LoggedInUsers");
-    if (!users->empty())
-      policy::AffiliationTestHelper::LoginUser(affiliated_account_id_);
-
-    ExtensionApiTest::SetUpOnMainThread();
-  }
-
-  // Load |page_url| in |browser| and wait for PASSED or FAILED notification.
-  // The functionality of this function is reduced functionality of
-  // RunExtensionSubtest(), but we don't use it here because it requires
-  // function InProcessBrowserTest::browser() to return non-NULL pointer.
-  // Unfortunately it returns the value which is set in constructor and can't be
-  // modified. Because on login flow there is no browser, the function
-  // InProcessBrowserTest::browser() always returns NULL. Besides this we need
-  // only very little functionality from RunExtensionSubtest(). Thus so that
-  // don't make RunExtensionSubtest() to complex we just introduce a new
-  // function.
-  bool TestExtension(Browser* browser,
-                     const std::string& page_url,
-                     const base::Value& custom_arg_value) {
-    DCHECK(!page_url.empty()) << "page_url cannot be empty";
-
-    std::string custom_arg;
-    base::JSONWriter::Write(custom_arg_value, &custom_arg);
-    SetCustomArg(custom_arg);
-
-    extensions::ResultCatcher catcher;
-    ui_test_utils::NavigateToURL(browser, GURL(page_url));
-
-    if (!catcher.GetNextResult()) {
-      message_ = catcher.message();
-      return false;
-    }
-    return true;
-  }
-
-  const AccountId affiliated_account_id_ =
-      AccountId::FromUserEmailGaiaId(kAffiliatedUserEmail,
-                                     kAffiliatedUserGaiaId);
-
-  policy::MockConfigurationPolicyProvider policy_provider_;
-
  private:
-  chromeos::ScopedStubInstallAttributes test_install_attributes_{
-      chromeos::StubInstallAttributes::CreateCloudManaged("fake-domain",
-                                                          "fake-id")};
-  policy::DevicePolicyCrosTestHelper test_helper_;
   chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
 };
 
@@ -215,36 +92,33 @@ IN_PROC_BROWSER_TEST_P(EnterpriseDeviceAttributesTest, PRE_Success) {
 }
 
 IN_PROC_BROWSER_TEST_P(EnterpriseDeviceAttributesTest, Success) {
-  policy_test_utils::SetUpEmbeddedTestServer(embedded_test_server());
-  ASSERT_TRUE(embedded_test_server()->Start());
-  policy_test_utils::SetExtensionInstallForcelistPolicy(
-      kTestExtensionID, embedded_test_server()->GetURL(kUpdateManifestPath),
-      profile(), &policy_provider_);
+  const bool is_affiliated = GetParam();
+  EXPECT_EQ(is_affiliated, user_manager::UserManager::Get()
+                               ->FindUser(affiliated_account_id_)
+                               ->IsAffiliated());
 
-  EXPECT_EQ(GetParam().affiliated, user_manager::UserManager::Get()
-                                       ->FindUser(affiliated_account_id_)
-                                       ->IsAffiliated());
+  ForceInstallExtension(kTestExtensionID, kUpdateManifestPath);
 
   // Device attributes are available only for affiliated user.
-  std::string expected_directory_device_id =
-      GetParam().affiliated ? kDeviceId : "";
-  std::string expected_serial_number =
-      GetParam().affiliated ? kSerialNumber : "";
-  std::string expected_asset_id = GetParam().affiliated ? kAssetId : "";
+  std::string expected_directory_device_id = is_affiliated ? kDeviceId : "";
+  std::string expected_serial_number = is_affiliated ? kSerialNumber : "";
+  std::string expected_asset_id = is_affiliated ? kAssetId : "";
   std::string expected_annotated_location =
-      GetParam().affiliated ? kAnnotatedLocation : "";
-  std::string expected_hostname = GetParam().affiliated ? kHostname : "";
-
-  // Pass the expected value (device_id) to test.
-  ASSERT_TRUE(TestExtension(
-      CreateBrowser(profile()),
-      base::StringPrintf("chrome-extension://%s/basic.html", kTestExtensionID),
-      BuildCustomArg(expected_directory_device_id, expected_serial_number,
-                     expected_asset_id, expected_annotated_location,
-                     expected_hostname)))
-      << message_;
+      is_affiliated ? kAnnotatedLocation : "";
+  std::string expected_hostname = is_affiliated ? kHostname : "";
+  TestExtension(CreateBrowser(profile()),
+                GURL(base::StringPrintf("chrome-extension://%s/basic.html",
+                                        kTestExtensionID)),
+                BuildCustomArg(expected_directory_device_id,
+                               expected_serial_number, expected_asset_id,
+                               expected_annotated_location, expected_hostname));
 }
 
+// Both cases of affiliated and non-affiliated on the device user are tested.
+INSTANTIATE_TEST_SUITE_P(AffiliationCheck,
+                         EnterpriseDeviceAttributesTest,
+                         ::testing::Bool());
+
 // Ensure that extensions that are not pre-installed by policy throw an install
 // warning if they request the enterprise.deviceAttributes permission in the
 // manifest and that such extensions don't see the
@@ -269,10 +143,4 @@ IN_PROC_BROWSER_TEST_F(
       extension->install_warnings()[0].message);
 }
 
-// Both cases of affiliated and non-affiliated on the device user are tested.
-INSTANTIATE_TEST_SUITE_P(AffiliationCheck,
-                         EnterpriseDeviceAttributesTest,
-                         ::testing::Values(Params(true /* affiliated */),
-                                           Params(false /* affiliated */)),
-                         PrintParam);
 }  //  namespace extensions

chrome/browser/extensions/api/force_installed_affiliated_extension_apitest.cc

+// Copyright 2020 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/api/force_installed_affiliated_extension_apitest.h"
+
+#include "base/json/json_writer.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/policy/affiliation_test_helper.h"
+#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
+#include "chrome/browser/extensions/policy_test_utils.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "chromeos/dbus/session_manager/fake_session_manager_client.h"
+#include "components/prefs/pref_service.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/test/result_catcher.h"
+
+namespace {
+
+// If running with |is_affiliated|==true, the test will use the same
+// |kAffiliationID| as user and device affiliation ID, which makes the user
+// affiliated (affiliation IDs overlap).
+// If running with |is_affiliated|==false, the test will use |kAffiliationID| as
+// device and |kAnotherAffiliationID| as user affiliation ID, which makes the
+// user non-affiliated (affiliation IDs don't overlap).
+constexpr char kAffiliationID[] = "some-affiliation-id";
+constexpr char kAnotherAffiliationID[] = "another-affiliation-id";
+
+constexpr char kAffiliatedUserEmail[] = "user@example.com";
+constexpr char kAffiliatedUserGaiaId[] = "1029384756";
+
+}  // namespace
+
+namespace extensions {
+
+ForceInstalledAffiliatedExtensionApiTest::
+    ForceInstalledAffiliatedExtensionApiTest(bool is_affiliated)
+    : is_affiliated_(is_affiliated),
+      affiliated_account_id_(
+          AccountId::FromUserEmailGaiaId(kAffiliatedUserEmail,
+                                         kAffiliatedUserGaiaId)),
+      test_install_attributes_(
+          chromeos::StubInstallAttributes::CreateCloudManaged("fake-domain",
+                                                              "fake-id")) {
+  set_exit_when_last_browser_closes(false);
+  set_chromeos_user_ = false;
+}
+
+ForceInstalledAffiliatedExtensionApiTest::
+    ~ForceInstalledAffiliatedExtensionApiTest() = default;
+
+void ForceInstalledAffiliatedExtensionApiTest::SetUpCommandLine(
+    base::CommandLine* command_line) {
+  ExtensionApiTest::SetUpCommandLine(command_line);
+  policy::AffiliationTestHelper::AppendCommandLineSwitchesForLoginManager(
+      command_line);
+}
+
+void ForceInstalledAffiliatedExtensionApiTest::
+    SetUpInProcessBrowserTestFixture() {
+  ExtensionApiTest::SetUpInProcessBrowserTestFixture();
+
+  // Initialize clients here so they are available during setup. They will be
+  // shutdown in ChromeBrowserMain.
+  chromeos::SessionManagerClient::InitializeFakeInMemory();
+  policy::AffiliationTestHelper affiliation_helper =
+      policy::AffiliationTestHelper::CreateForCloud(
+          chromeos::FakeSessionManagerClient::Get());
+
+  std::set<std::string> device_affiliation_ids;
+  device_affiliation_ids.insert(kAffiliationID);
+  ASSERT_NO_FATAL_FAILURE(affiliation_helper.SetDeviceAffiliationIDs(
+      &test_helper_, device_affiliation_ids));
+  test_helper_.InstallOwnerKey();
+
+  std::set<std::string> user_affiliation_ids;
+  if (is_affiliated_) {
+    user_affiliation_ids.insert(kAffiliationID);
+  } else {
+    user_affiliation_ids.insert(kAnotherAffiliationID);
+  }
+  policy::UserPolicyBuilder user_policy;
+  ASSERT_NO_FATAL_FAILURE(affiliation_helper.SetUserAffiliationIDs(
+      &user_policy, affiliated_account_id_, user_affiliation_ids));
+  test_helper_.InstallOwnerKey();
+
+  // Init the user policy provider.
+  EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
+      .WillRepeatedly(testing::Return(true));
+  policy_provider_.SetAutoRefresh();
+  policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
+      &policy_provider_);
+
+  // Set retry delay to prevent timeouts.
+  policy::DeviceManagementService::SetRetryDelayForTesting(0);
+}
+
+void ForceInstalledAffiliatedExtensionApiTest::SetUpOnMainThread() {
+  // Log in user that was created with
+  // policy::AffiliationTestHelper::PreLoginUser() in the PRE_ test.
+  const base::ListValue* users =
+      g_browser_process->local_state()->GetList("LoggedInUsers");
+  if (!users->empty()) {
+    policy::AffiliationTestHelper::LoginUser(affiliated_account_id_);
+  }
+
+  policy_test_utils::SetUpEmbeddedTestServer(embedded_test_server());
+  ASSERT_TRUE(embedded_test_server()->Start());
+
+  ExtensionApiTest::SetUpOnMainThread();
+}
+
+void ForceInstalledAffiliatedExtensionApiTest::ForceInstallExtension(
+    const extensions::ExtensionId& extension_id,
+    const std::string& update_manifest_path) {
+  policy_test_utils::SetExtensionInstallForcelistPolicy(
+      extension_id, embedded_test_server()->GetURL(update_manifest_path),
+      profile(), &policy_provider_);
+  ASSERT_TRUE(ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(
+      extension_id));
+}
+
+void ForceInstalledAffiliatedExtensionApiTest::TestExtension(
+    Browser* browser,
+    const GURL& page_url,
+    const base::Value& custom_arg_value) {
+  DCHECK(page_url.is_valid()) << "page_url must be valid";
+
+  std::string custom_arg;
+  base::JSONWriter::Write(custom_arg_value, &custom_arg);
+  SetCustomArg(custom_arg);
+
+  extensions::ResultCatcher catcher;
+  ui_test_utils::NavigateToURL(browser, GURL(page_url));
+
+  ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
+}
+
+}  //  namespace extensions

chrome/browser/extensions/api/force_installed_affiliated_extension_apitest.h

+// Copyright 2020 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.
+
+#ifndef CHROME_BROWSER_EXTENSIONS_API_FORCE_INSTALLED_AFFILIATED_EXTENSION_APITEST_H_
+#define CHROME_BROWSER_EXTENSIONS_API_FORCE_INSTALLED_AFFILIATED_EXTENSION_APITEST_H_
+
+#include <string>
+
+#include "base/values.h"
+#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
+#include "chrome/browser/extensions/extension_apitest.h"
+#include "chromeos/tpm/stub_install_attributes.h"
+#include "components/account_id/account_id.h"
+#include "components/policy/core/common/mock_configuration_policy_provider.h"
+#include "extensions/common/extension_id.h"
+#include "url/gurl.h"
+
+class Browser;
+
+namespace base {
+class CommandLine;
+}  // namespace base
+
+namespace extensions {
+
+// TODO(https://crbug.com/1082195) Create force-installed extension and user
+// affiliation test mixins to replace this class.
+
+// Helper class to test force-installed extensions in a
+// affiliated/non-affiliated user profile.
+class ForceInstalledAffiliatedExtensionApiTest : public ExtensionApiTest {
+ public:
+  explicit ForceInstalledAffiliatedExtensionApiTest(bool is_affiliated);
+  ~ForceInstalledAffiliatedExtensionApiTest() override;
+
+ protected:
+  // ExtensionApiTest
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpInProcessBrowserTestFixture() override;
+  void SetUpOnMainThread() override;
+
+  void ForceInstallExtension(const extensions::ExtensionId& extension_id,
+                             const std::string& update_manifest_path);
+
+  // Sets |custom_arg_value|, loads |page_url| and waits for an extension API
+  // test pass/fail notification.
+  void TestExtension(Browser* browser,
+                     const GURL& page_url,
+                     const base::Value& custom_arg_value);
+
+  // Whether the user should be affiliated (= user and device affiliation IDs
+  // overlap).
+  const bool is_affiliated_;
+
+  const AccountId affiliated_account_id_;
+  policy::MockConfigurationPolicyProvider policy_provider_;
+  chromeos::ScopedStubInstallAttributes test_install_attributes_;
+  policy::DevicePolicyCrosTestHelper test_helper_;
+};
+
+}  //  namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_API_FORCE_INSTALLED_AFFILIATED_EXTENSION_APITEST_H_

chrome/test/BUILD.gn

@@ -1678,8 +1678,6 @@ if (!is_android) {
         "../browser/extensions/api/desktop_capture/desktop_capture_apitest.cc",
         "../browser/extensions/api/developer_private/developer_private_apitest.cc",
         "../browser/extensions/api/downloads/downloads_api_browsertest.cc",
-        "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
-        "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
         "../browser/extensions/api/extension_action/browser_action_apitest.cc",
         "../browser/extensions/api/extension_action/browser_action_browsertest.cc",
         "../browser/extensions/api/extension_action/extension_action_apitest.cc",
@@ -1715,9 +1713,6 @@ if (!is_android) {
         "../browser/extensions/api/page_capture/page_capture_apitest.cc",
         "../browser/extensions/api/passwords_private/passwords_private_apitest.cc",
         "../browser/extensions/api/permissions/permissions_apitest.cc",
-        "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
-        "../browser/extensions/api/platform_keys/platform_keys_test_base.cc",
-        "../browser/extensions/api/platform_keys/platform_keys_test_base.h",
         "../browser/extensions/api/preference/preference_apitest.cc",
         "../browser/extensions/api/processes/processes_apitest.cc",
         "../browser/extensions/api/proxy/proxy_apitest.cc",
@@ -1735,7 +1730,6 @@ if (!is_android) {
         "../browser/extensions/api/tab_capture/tab_capture_performance_test_base.h",
         "../browser/extensions/api/tab_capture/tab_capture_performancetest.cc",
         "../browser/extensions/api/tabs/tabs_test.cc",
-        "../browser/extensions/api/terminal/terminal_private_apitest.cc",
         "../browser/extensions/api/test/apitest_apitest.cc",
         "../browser/extensions/api/top_sites/top_sites_apitest.cc",
         "../browser/extensions/api/web_navigation/web_navigation_apitest.cc",
@@ -1887,7 +1881,15 @@ if (!is_android) {
         sources += [
           "../browser/accessibility/accessibility_extension_api_browsertest.cc",
           "../browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc",
+          "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
+          "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
+          "../browser/extensions/api/force_installed_affiliated_extension_apitest.cc",
+          "../browser/extensions/api/force_installed_affiliated_extension_apitest.h",
+          "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
+          "../browser/extensions/api/platform_keys/platform_keys_test_base.cc",
+          "../browser/extensions/api/platform_keys/platform_keys_test_base.h",
           "../browser/extensions/api/system_display/system_display_chromeos_apitest.cc",
+          "../browser/extensions/api/terminal/terminal_private_apitest.cc",
           "../browser/extensions/api/terminal/terminal_private_browsertest.cc",
           "../browser/extensions/clipboard_extension_apitest_chromeos.cc",
         ]
@@ -2551,16 +2553,6 @@ if (!is_android) {
         "data/webui/certificate_viewer_ui_test-inl.h",
       ]
       sources += [ "../browser/profiles/profile_window_browsertest.cc" ]
-      if (enable_extensions) {
-        sources -= [
-          "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
-          "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
-          "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
-          "../browser/extensions/api/platform_keys/platform_keys_test_base.cc",
-          "../browser/extensions/api/platform_keys/platform_keys_test_base.h",
-          "../browser/extensions/api/terminal/terminal_private_apitest.cc",
-        ]
-      }
       if (toolkit_views) {
         sources -= [
           "../browser/ui/views/select_file_dialog_extension_browsertest.cc",