New user type introduced. Combines regular and supervised features.

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 413 matching lines @@
   }
 }
 
 void DeviceStatusCollector::GetUsers(em::DeviceStatusReportRequest* request) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   const user_manager::UserList& users =
       user_manager::UserManager::Get()->GetUsers();
   user_manager::UserList::const_iterator user;
   for (user = users.begin(); user != users.end(); ++user) {
-    // Only regular users are reported.
-    if ((*user)->GetType() != user_manager::USER_TYPE_REGULAR)
+    // Only users with gaia accounts (regular) are reported.

[bartfab (slow), 2014/11/27 12:51:50]

Nit: As before, I think we should drop the " (regular)"

+    if (!(*user)->HasGaiaAccount())
       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);
     } else {
       device_user->set_type(em::DeviceUser::USER_TYPE_UNMANAGED);
       // Do not report the email address of unmanaged users.
@@ skipping 103 matching lines @@
     location.SetDouble(kSpeed, position.speed);
     location.SetString(kTimestamp,
         base::Int64ToString(position.timestamp.ToInternalValue()));
     local_state_->Set(prefs::kDeviceLocation, location);
   }
 
   ScheduleGeolocationUpdateRequest();
 }
 
 }  // namespace policy