Index: chrome/browser/chromeos/settings/device_settings_test_helper.cc |
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc |
index ae21509f0aa5d93f6c498dfd01104050f1a9d93b..19c82c3a56c872e07d85ffe919d5e4deef56c519 100644 |
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc |
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc |
@@ -12,10 +12,10 @@ |
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
-#include "chrome/browser/chromeos/settings/mock_owner_key_util.h" |
#include "chrome/test/base/testing_browser_process.h" |
#include "chrome/test/base/testing_profile.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
+#include "components/ownership/mock_owner_key_util.h" |
#include "content/public/browser/browser_thread.h" |
namespace chromeos { |
@@ -191,7 +191,8 @@ DeviceSettingsTestHelper::PolicyState::~PolicyState() {} |
ScopedDeviceSettingsTestHelper::ScopedDeviceSettingsTestHelper() { |
DeviceSettingsService::Initialize(); |
- DeviceSettingsService::Get()->SetSessionManager(this, new MockOwnerKeyUtil()); |
+ DeviceSettingsService::Get()->SetSessionManager( |
+ this, new ownership::MockOwnerKeyUtil()); |
DeviceSettingsService::Get()->Load(); |
Flush(); |
} |
@@ -205,7 +206,7 @@ ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() { |
DeviceSettingsTestBase::DeviceSettingsTestBase() |
: user_manager_(new FakeUserManager()), |
user_manager_enabler_(user_manager_), |
- owner_key_util_(new MockOwnerKeyUtil()) { |
+ owner_key_util_(new ownership::MockOwnerKeyUtil()) { |
} |
DeviceSettingsTestBase::~DeviceSettingsTestBase() { |