chrome/browser/chromeos/policy/device_status_collector_browsertest.cc - Issue 255873002: Revert of Add ScopedStubEnterpriseInstallAttributes for tests to set test install attributes.

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/chromeos/policy/device_status_collector_browsertest.cc

Issue 255873002: Revert of Add ScopedStubEnterpriseInstallAttributes for tests to set test install attributes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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/policy/browser_policy_connector_chromeos.cc ('k') | chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

index 985350eeee967dbd47206521ca5d423a7fa274ee..b2f62e98b9afe26c2b04f77e293308c5025e90a9 100644

--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

@@ -152,10 +152,6 @@

: ui_thread_(content::BrowserThread::UI, &message_loop_),

file_thread_(content::BrowserThread::FILE, &message_loop_),

io_thread_(content::BrowserThread::IO, &message_loop_),

- install_attributes_("managed.com",

- "user@managed.com",

- "device_id",

- DEVICE_MODE_ENTERPRISE),

user_manager_(new chromeos::MockUserManager()),

user_manager_enabler_(user_manager_) {

// Run this test with a well-known timezone so that Time::LocalMidnight()

@@ -176,6 +172,13 @@

EXPECT_TRUE(

cros_settings_->RemoveSettingsProvider(device_settings_provider_));

cros_settings_->AddSettingsProvider(&stub_settings_provider_);

+ // Set up fake install attributes.

+ StubEnterpriseInstallAttributes* attributes =

+ new StubEnterpriseInstallAttributes();

+ attributes->SetDomain("managed.com");

+ attributes->SetRegistrationUser("user@managed.com");

+ BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(attributes);

RestartStatusCollector();

}

@@ -258,7 +261,6 @@

content::TestBrowserThread file_thread_;

content::TestBrowserThread io_thread_;

- ScopedStubEnterpriseInstallAttributes install_attributes_;

TestingPrefServiceSimple prefs_;

chromeos::system::MockStatisticsProvider statistics_provider_;

chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;