Remove enterprise device user report size limit.

chrome/browser/chromeos/policy/device_status_collector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 55 matching lines @@
 
 // Determine the day key (milliseconds since epoch for corresponding day in UTC)
 // for a given |timestamp|.
 int64 TimestampToDayKey(Time timestamp) {
   Time::Exploded exploded;
   timestamp.LocalMidnight().LocalExplode(&exploded);
   return (Time::FromUTCExploded(exploded) - Time::UnixEpoch()).InMilliseconds();
 }
 
 // Maximum number of users to report.
-const int kMaxUserCount = 5;
+const int kMaxUserCount = 500;
 
 }  // namespace
 
 namespace policy {
 
 DeviceStatusCollector::DeviceStatusCollector(
     PrefService* local_state,
     chromeos::system::StatisticsProvider* provider,
     LocationUpdateRequester* location_update_requester)
     : max_stored_past_activity_days_(kMaxStoredPastActivityDays),
@@ skipping 336 matching lines @@
     if (!(*device)->meid().empty())
       interface->set_meid((*device)->meid());
     if (!(*device)->imei().empty())
       interface->set_imei((*device)->imei());
   }
 }
 
 void DeviceStatusCollector::GetUsers(em::DeviceStatusReportRequest* request) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  bool found_managed_user = false;
   const chromeos::UserList& users = chromeos::UserManager::Get()->GetUsers();
   chromeos::UserList::const_iterator user;
   for (user = users.begin(); user != users.end(); ++user) {
     // Only regular users are reported.
     if ((*user)->GetType() != chromeos::User::USER_TYPE_REGULAR)
       continue;
 
     em::DeviceUser* device_user = request->add_user();
     const std::string& email = (*user)->email();
     if (connector->GetUserAffiliation(email) == USER_AFFILIATION_MANAGED) {
       device_user->set_type(em::DeviceUser::USER_TYPE_MANAGED);
       device_user->set_email(email);
-      found_managed_user = true;
     } else {
       device_user->set_type(em::DeviceUser::USER_TYPE_UNMANAGED);
       // Do not report the email address of unmanaged users.
     }
 
-    // Add only kMaxUserCount entries, unless no managed users are found in the
-    // first kMaxUserCount users. In that case, continue until at least one
-    // managed user is found.
-    if (request->user_size() >= kMaxUserCount && found_managed_user)
+    // Add only kMaxUserCount entries.
+    if (request->user_size() >= kMaxUserCount)

[Joao da Silva, 2014/07/07 09:43:23]

500 is an extreme limit for this... why not just remove this logic? The bug
doesn't have enough context and I may be missing something here.

       break;
   }
 }
 
 void DeviceStatusCollector::GetStatus(em::DeviceStatusReportRequest* request) {
   // TODO(mnissler): Remove once the old cloud policy stack is retired. The old
   // stack doesn't support reporting successful submissions back to here, so
   // just assume whatever ends up in |request| gets submitted successfully.
   GetDeviceStatus(request);
   OnSubmittedSuccessfully();
@@ skipping 93 matching lines @@
     location.SetDouble(kSpeed, position.speed);
     location.SetString(kTimestamp,
         base::Int64ToString(position.timestamp.ToInternalValue()));
     local_state_->Set(prefs::kDeviceLocation, location);
   }
 
   ScheduleGeolocationUpdateRequest();
 }
 
 }  // namespace policy