chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc - Issue 2382833002: Rename policy::EnterpriseInstallAttributes to chromeos::InstallAttributes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.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

« no previous file with comments | « chrome/browser/chromeos/system/device_disabling_manager_unittest.cc ('k') | chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

diff --git a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

index b5107562eb24342071d0429ad7448b8e2404a226..329d1cccfee93c16f01c54a20581a3d7fe692bcc 100644

--- a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

+++ b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

@@ -2,12 +2,13 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "base/memory/ptr_util.h"

#include "base/strings/stringprintf.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/policy/affiliation_test_helper.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

-#include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"

+#include "chrome/browser/chromeos/settings/stub_install_attributes.h"

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/browser/net/url_request_mock_util.h"

#include "chrome/test/base/ui_test_utils.h"

@@ -96,8 +97,8 @@ class EnterpriseDeviceAttributesTest :

affiliated_account_id_.GetUserEmail(), user_affiliation_ids);

// Set up fake install attributes.

- std::unique_ptr<policy::StubEnterpriseInstallAttributes> attributes(

- new policy::StubEnterpriseInstallAttributes());

+ std::unique_ptr<chromeos::StubInstallAttributes> attributes =

+ base::MakeUnique<chromeos::StubInstallAttributes>();

attributes->SetRegistrationUser(affiliated_account_id_.GetUserEmail());

policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(