Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc |
index ea0f0c47e53b0358b485adc574b4f21b3b85ad94..17b8e64b13476d09b29e6b1b80abfca5f87b1e5f 100644 |
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc |
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc |
@@ -25,8 +25,10 @@ |
#include "chrome/browser/chromeos/login/startup_utils.h" |
#include "chrome/browser/chromeos/login/ui/login_display_host.h" |
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" |
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
#include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h" |
+#include "chrome/browser/chromeos/policy/device_policy_builder.h" |
#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
#include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
@@ -41,6 +43,7 @@ |
#include "chromeos/dbus/dbus_thread_manager.h" |
#include "chromeos/dbus/fake_session_manager_client.h" |
#include "chromeos/dbus/session_manager_client.h" |
+#include "components/ownership/mock_owner_key_util.h" |
#include "components/policy/core/common/cloud/cloud_policy_core.h" |
#include "components/policy/core/common/cloud/cloud_policy_store.h" |
#include "components/policy/core/common/cloud/cloud_policy_validator.h" |
@@ -146,6 +149,7 @@ class WallpaperManagerPolicyTest : public LoginManagerTest, |
WallpaperManagerPolicyTest() |
: LoginManagerTest(true), |
wallpaper_change_count_(0), |
+ owner_key_util_(new ownership::MockOwnerKeyUtil()), |
fake_session_manager_client_(new FakeSessionManagerClient) { |
testUsers_.push_back( |
AccountId::FromUserEmail(LoginManagerTest::kEnterpriseUser1)); |
@@ -178,6 +182,15 @@ class WallpaperManagerPolicyTest : public LoginManagerTest, |
// LoginManagerTest: |
void SetUpInProcessBrowserTestFixture() override { |
+ device_policy_.Build(); |
+ OwnerSettingsServiceChromeOSFactory::GetInstance() |
+ ->SetOwnerKeyUtilForTesting(owner_key_util_); |
+ owner_key_util_->SetPublicKeyFromPrivateKey( |
+ *device_policy_.GetSigningKey()); |
+ fake_session_manager_client_->set_device_policy(device_policy_.GetBlob()); |
+ DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
+ std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); |
+ |
// Set up fake install attributes. |
std::unique_ptr<chromeos::StubInstallAttributes> attributes = |
base::MakeUnique<chromeos::StubInstallAttributes>(); |
@@ -185,9 +198,6 @@ class WallpaperManagerPolicyTest : public LoginManagerTest, |
policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting( |
attributes.release()); |
- DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
- std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); |
- |
LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); |
} |
@@ -290,6 +300,8 @@ class WallpaperManagerPolicyTest : public LoginManagerTest, |
std::unique_ptr<base::RunLoop> run_loop_; |
int wallpaper_change_count_; |
std::unique_ptr<policy::UserPolicyBuilder> user_policy_builders_[2]; |
+ policy::DevicePolicyBuilder device_policy_; |
+ scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_; |
FakeSessionManagerClient* fake_session_manager_client_; |
std::vector<AccountId> testUsers_; |