Switch to id-based affiliation determination

chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

 // Copyright 2015 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/affiliated_invalidation_service_provider_impl.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 138 matching lines @@
   Profile* profile = content::Details<Profile>(details).ptr();
   invalidation::ProfileInvalidationProvider* invalidation_provider =
       invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile);
   if (!invalidation_provider) {
     // If the Profile does not support invalidation (e.g. guest, incognito),
     // ignore it.
     return;
   }
   const user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
-  if (!user ||
-      g_browser_process->platform_part()->browser_policy_connector_chromeos()->
-          GetUserAffiliation(user->email()) != USER_AFFILIATION_MANAGED) {
-    // If the Profile belongs to a user who is not affiliated with the device's
-    // enrollment domain, ignore it.
+  if (!user || !user->is_affiliated()) {
+    // If the Profile belongs to a user who is not affiliated on the device,
+    // ignore it.
     return;
   }
 
   // Create a state observer for the user's invalidation service.
   invalidation::InvalidationService* invalidation_service =
       invalidation_provider->GetInvalidationService();
   profile_invalidation_service_observers_.push_back(
       new InvalidationServiceObserver(this, invalidation_service));
 
   if (profile_invalidation_service_observers_.back()->IsServiceConnected()) {
@@ skipping 167 matching lines @@
                     OnInvalidationServiceSet(invalidation_service_));
 }
 
 void
 AffiliatedInvalidationServiceProviderImpl::DestroyDeviceInvalidationService() {
   device_invalidation_service_observer_.reset();
   device_invalidation_service_.reset();
 }
 
 }  // namespace policy