Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: chrome/browser/chromeos/settings/device_settings_test_helper.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed GYP file. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.h ('k') | chrome/browser/chromeos/settings/mock_owner_key_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698