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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Issue 2382833002: Rename policy::EnterpriseInstallAttributes to chromeos::InstallAttributes. (Closed)
Patch Set: Add missing #includes. Created 4 years, 3 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/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index f1bbf75e181d3730da3ef63b93b2bd2d9ef96eb9..879a91dbf29ea0b86b444d5758877ff98a892de9 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -23,13 +23,13 @@
#include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
#include "chrome/browser/chromeos/policy/enrollment_config.h"
#include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
-#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
+#include "chrome/browser/chromeos/settings/install_attributes.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
@@ -78,8 +78,8 @@ namespace policy {
namespace {
void CopyLockResult(base::RunLoop* loop,
- EnterpriseInstallAttributes::LockResult* out,
- EnterpriseInstallAttributes::LockResult result) {
+ chromeos::InstallAttributes::LockResult* out,
+ chromeos::InstallAttributes::LockResult result) {
*out = result;
loop->Quit();
}
@@ -135,7 +135,7 @@ class DeviceCloudPolicyManagerChromeOSTest
cryptohome::AsyncMethodCaller::Initialize();
install_attributes_.reset(
- new EnterpriseInstallAttributes(fake_cryptohome_client_));
+ new chromeos::InstallAttributes(fake_cryptohome_client_));
store_ = new DeviceCloudPolicyStoreChromeOS(
&device_settings_service_, install_attributes_.get(),
base::ThreadTaskRunnerHandle::Get());
@@ -192,14 +192,14 @@ class DeviceCloudPolicyManagerChromeOSTest
void LockDevice() {
base::RunLoop loop;
- EnterpriseInstallAttributes::LockResult result;
+ chromeos::InstallAttributes::LockResult result;
install_attributes_->LockDevice(
PolicyBuilder::kFakeUsername,
DEVICE_MODE_ENTERPRISE,
PolicyBuilder::kFakeDeviceId,
base::Bind(&CopyLockResult, &loop, &result));
loop.Run();
- ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS, result);
+ ASSERT_EQ(chromeos::InstallAttributes::LOCK_SUCCESS, result);
}
void ConnectManager() {
@@ -243,7 +243,7 @@ class DeviceCloudPolicyManagerChromeOSTest
MOCK_METHOD0(OnDeviceCloudPolicyManagerConnected, void());
MOCK_METHOD0(OnDeviceCloudPolicyManagerDisconnected, void());
- std::unique_ptr<EnterpriseInstallAttributes> install_attributes_;
+ std::unique_ptr<chromeos::InstallAttributes> install_attributes_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
net::TestURLFetcherFactory url_fetcher_factory_;

Powered by Google App Engine
This is Rietveld 408576698