Chromium Code Reviews| 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..3ca5aa2dd3ec4034ee6c7e1a18d79f626ded23d0 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" |
| @@ -132,6 +133,10 @@ class SigninExtensionsDeviceCloudPolicyBrowserTestBase |
| service->set_extensions_enabled(true); |
| } |
| + void TearDownOnMainThread() override { |
|
emaxx
2016/11/11 16:11:37
Is this actually needed?
Denis Kuznetsov (DE-MUC)
2016/11/11 21:26:34
Done.
|
| + DevicePolicyCrosBrowserTest::TearDownOnMainThread(); |
| + } |
| + |
| static base::FilePath GetTestExtensionSourcePath() { |
| base::FilePath test_data_dir; |
| EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)); |
| @@ -232,6 +237,8 @@ class SigninExtensionsDeviceCloudPolicyBrowserTest |
| void SetUpInProcessBrowserTestFixture() override { |
| SigninExtensionsDeviceCloudPolicyBrowserTestBase:: |
| SetUpInProcessBrowserTestFixture(); |
| + disabler_ = |
| + base::MakeUnique<chromeos::ScopedSigninScreenPolicyProviderDisabler>(); |
| EXPECT_TRUE(PathService::Get(chromeos::DIR_SIGNIN_PROFILE_COMPONENT_POLICY, |
| &component_policy_cache_dir_)); |
| PrepareFakeComponentPolicyResponse(); |
| @@ -272,6 +279,7 @@ class SigninExtensionsDeviceCloudPolicyBrowserTest |
| net::URLFetcherImplFactory fetcher_impl_factory_; |
| net::FakeURLFetcherFactory fetcher_factory_; |
| base::FilePath component_policy_cache_dir_; |
| + std::unique_ptr<chromeos::ScopedSigninScreenPolicyProviderDisabler> disabler_; |
|
emaxx
2016/11/11 16:11:37
Maybe change this member to have a more descriptiv
Denis Kuznetsov (DE-MUC)
2016/11/11 21:26:34
Done.
|
| }; |
| IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest, |
| @@ -297,13 +305,21 @@ class PreinstalledSigninExtensionsDeviceCloudPolicyBrowserTest |
| constexpr static const char* kFakeProfileSourceDir = |
| "extensions/profiles/signin_screen_managed_storage"; |
| - private: |
| + std::unique_ptr<chromeos::ScopedSigninScreenPolicyProviderDisabler> disabler_; |
| + |
| bool SetUpUserDataDirectory() override { |
| PrefillSigninProfile(); |
| PrefillComponentPolicyCache(); |
| return DevicePolicyCrosBrowserTest::SetUpUserDataDirectory(); |
| } |
| + void SetUpInProcessBrowserTestFixture() override { |
| + SigninExtensionsDeviceCloudPolicyBrowserTestBase:: |
| + SetUpInProcessBrowserTestFixture(); |
| + disabler_ = |
|
emaxx
2016/11/11 16:11:37
If both test subclasses need this disabler, then w
Denis Kuznetsov (DE-MUC)
2016/11/11 21:26:34
Acknowledged.
|
| + base::MakeUnique<chromeos::ScopedSigninScreenPolicyProviderDisabler>(); |
| + } |
| + |
| static void PrefillSigninProfile() { |
| base::FilePath profile_source_path; |
| EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &profile_source_path)); |