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 7be5ff12f924e25512c505aab4c87a56e8269865..6e4a1f5903d93b5c1805aeac44c1ddab57b6b245 100644 |
--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc |
+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc |
@@ -648,12 +648,12 @@ TEST_F(DeviceStatusCollectorTest, ReportUsers) { |
// Verify that users are reported by default. |
GetStatus(); |
- EXPECT_EQ(5, status_.user_size()); |
+ EXPECT_EQ(6, status_.user_size()); |
// Verify that users are reported after enabling the setting. |
cros_settings_->SetBoolean(chromeos::kReportDeviceUsers, true); |
GetStatus(); |
- EXPECT_EQ(5, status_.user_size()); |
+ EXPECT_EQ(6, status_.user_size()); |
EXPECT_EQ(em::DeviceUser::USER_TYPE_MANAGED, status_.user(0).type()); |
EXPECT_EQ("user0@managed.com", status_.user(0).email()); |
EXPECT_EQ(em::DeviceUser::USER_TYPE_MANAGED, status_.user(1).type()); |
@@ -664,6 +664,8 @@ TEST_F(DeviceStatusCollectorTest, ReportUsers) { |
EXPECT_FALSE(status_.user(3).has_email()); |
EXPECT_EQ(em::DeviceUser::USER_TYPE_MANAGED, status_.user(4).type()); |
EXPECT_EQ("user4@managed.com", status_.user(4).email()); |
+ EXPECT_EQ(em::DeviceUser::USER_TYPE_MANAGED, status_.user(5).type()); |
+ EXPECT_EQ("user5@managed.com", status_.user(5).email()); |
// Verify that users are no longer reported if setting is disabled. |
cros_settings_->SetBoolean(chromeos::kReportDeviceUsers, false); |
@@ -671,26 +673,6 @@ TEST_F(DeviceStatusCollectorTest, ReportUsers) { |
EXPECT_EQ(0, status_.user_size()); |
} |
-TEST_F(DeviceStatusCollectorTest, ReportManagedUser) { |
- // Verify that at least one managed user is reported regardless of list size. |
- user_manager_->AddUser("user0@unmanaged.com"); |
- user_manager_->AddUser("user1@unmanaged.com"); |
- user_manager_->AddUser("user2@unmanaged.com"); |
- user_manager_->AddUser("user3@unmanaged.com"); |
- user_manager_->AddUser("user4@unmanaged.com"); |
- user_manager_->AddUser("user5@unmanaged.com"); |
- user_manager_->AddUser("user6@managed.com"); |
- user_manager_->AddUser("user7@managed.com"); |
- |
- cros_settings_->SetBoolean(chromeos::kReportDeviceUsers, true); |
- GetStatus(); |
- EXPECT_EQ(7, status_.user_size()); |
- for (int i = 0; i < 6; ++i) |
- EXPECT_EQ(em::DeviceUser::USER_TYPE_UNMANAGED, status_.user(i).type()); |
- EXPECT_EQ(em::DeviceUser::USER_TYPE_MANAGED, status_.user(6).type()); |
- EXPECT_EQ("user6@managed.com", status_.user(6).email()); |
-} |
- |
// Fake device state. |
struct FakeDeviceData { |
const char* device_path; |