| Index: chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
|
| index e3b6edeffc7d9cd123008a10a9af4b59f7d68391..b8ae86302dd857801dd2b22ef2cdc750755c1585 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/test/null_task_runner.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browser_process_platform_part.h"
|
| +#include "chrome/browser/chromeos/extensions/signin_screen_policy_provider.h"
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
|
| @@ -232,6 +233,8 @@ class SigninExtensionsDeviceCloudPolicyBrowserTest
|
| void SetUpInProcessBrowserTestFixture() override {
|
| SigninExtensionsDeviceCloudPolicyBrowserTestBase::
|
| SetUpInProcessBrowserTestFixture();
|
| + signin_policy_provided_disabler_ =
|
| + chromeos::GetScopedSigninScreenPolicyProviderDisablerForTesting();
|
| EXPECT_TRUE(PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY,
|
| &component_policy_cache_dir_));
|
| PrepareFakeComponentPolicyResponse();
|
| @@ -272,6 +275,7 @@ class SigninExtensionsDeviceCloudPolicyBrowserTest
|
| net::URLFetcherImplFactory fetcher_impl_factory_;
|
| net::FakeURLFetcherFactory fetcher_factory_;
|
| base::FilePath component_policy_cache_dir_;
|
| + std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_;
|
| };
|
|
|
| IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest,
|
| @@ -297,13 +301,21 @@ class PreinstalledSigninExtensionsDeviceCloudPolicyBrowserTest
|
| constexpr static const char* kFakeProfileSourceDir =
|
| "extensions/profiles/signin_screen_managed_storage";
|
|
|
| - private:
|
| + std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_;
|
| +
|
| bool SetUpUserDataDirectory() override {
|
| PrefillSigninProfile();
|
| PrefillComponentPolicyCache();
|
| return DevicePolicyCrosBrowserTest::SetUpUserDataDirectory();
|
| }
|
|
|
| + void SetUpInProcessBrowserTestFixture() override {
|
| + SigninExtensionsDeviceCloudPolicyBrowserTestBase::
|
| + SetUpInProcessBrowserTestFixture();
|
| + signin_policy_provided_disabler_ =
|
| + chromeos::GetScopedSigninScreenPolicyProviderDisablerForTesting();
|
| + }
|
| +
|
| static void PrefillSigninProfile() {
|
| base::FilePath profile_source_path;
|
| EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &profile_source_path));
|
|
|