| Index: chrome/browser/chromeos/policy/device_status_collector.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
|
| index 1fc6cb7e7b666abd6a99450108f5b0ad4a54fefd..92670b543f45b7a2679dbc80d9231946805b87c5 100644
|
| --- a/chrome/browser/chromeos/policy/device_status_collector.cc
|
| +++ b/chrome/browser/chromeos/policy/device_status_collector.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/command_line.h"
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -25,6 +26,7 @@
|
| #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/pref_names.h"
|
| +#include "chromeos/chromeos_switches.h"
|
| #include "chromeos/network/device_state.h"
|
| #include "chromeos/network/network_handler.h"
|
| #include "chromeos/network/network_state_handler.h"
|
| @@ -512,8 +514,10 @@ bool DeviceStatusCollector::GetDeviceStatus(
|
| if (report_network_interfaces_)
|
| GetNetworkInterfaces(status);
|
|
|
| - if (report_users_)
|
| + if (report_users_ && CommandLine::ForCurrentProcess()->HasSwitch(
|
| + chromeos::switches::kEnableEnterpriseUserReporting)) {
|
| GetUsers(status);
|
| + }
|
|
|
| return true;
|
| }
|
|
|