We should use UserID object to identify users instead of username.

components/policy/core/browser/browser_policy_connector.cc

 // Copyright 2014 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 "components/policy/core/browser/browser_policy_connector.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/configuration_policy_provider.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/policy/core/common/policy_service_impl.h"
 #include "components/policy/core/common/policy_statistics_collector.h"
 #include "components/policy/core/common/policy_switches.h"
+#include "components/user_manager/user_id.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "policy/policy_constants.h"
 #include "third_party/icu/source/i18n/unicode/regex.h"
 
 namespace policy {
 
 namespace {
 
 // The URL for the device management server.
@@ skipping 170 matching lines @@
 void BrowserPolicyConnector::SetPolicyProviderForTesting(
     ConfigurationPolicyProvider* provider) {
   // If this function is used by a test then it must be called before the
   // browser is created, and GetPolicyService() gets called.
   CHECK(!g_created_policy_service);
   DCHECK(!g_testing_provider);
   g_testing_provider = provider;
 }
 
 // static
-bool BrowserPolicyConnector::IsNonEnterpriseUser(const std::string& username) {
-  if (username.empty() || username.find('@') == std::string::npos) {
-    // An empty username means incognito user in case of ChromiumOS and
+bool BrowserPolicyConnector::IsNonEnterpriseUser(const user_manager::UserID& user_id) {
+  const std::string& email = user_id.GetUserEmail();
+  if (email.empty() || email.find('@') == std::string::npos) {
+    // An empty email means incognito user in case of ChromiumOS and
     // no logged-in user in case of Chromium (SigninService). Many tests use
     // nonsense email addresses (e.g. 'test') so treat those as non-enterprise
     // users.
     return true;
   }
   const base::string16 domain = base::UTF8ToUTF16(
-      gaia::ExtractDomainName(gaia::CanonicalizeEmail(username)));
+      gaia::ExtractDomainName(gaia::CanonicalizeEmail(email)));
   for (size_t i = 0; i < arraysize(kNonManagedDomainPatterns); i++) {
     base::string16 pattern = base::WideToUTF16(kNonManagedDomainPatterns[i]);
     if (MatchDomain(domain, pattern, i))
       return true;
   }
   return false;
 }
 
 // static
 std::string BrowserPolicyConnector::GetDeviceManagementUrl() {
@@ skipping 17 matching lines @@
 }
 
 void BrowserPolicyConnector::SetPlatformPolicyProvider(
     scoped_ptr<ConfigurationPolicyProvider> provider) {
   CHECK(!platform_policy_provider_);
   platform_policy_provider_ = provider.get();
   AddPolicyProvider(provider.Pass());
 }
 
 }  // namespace policy