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

chrome/browser/chromeos/net/onc_utils.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/net/onc_utils.h"
 
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 143 matching lines @@
  public:
   explicit UserStringSubstitution(const user_manager::User* user)
       : user_(user) {}
   ~UserStringSubstitution() override {}
 
   bool GetSubstitute(const std::string& placeholder,
                      std::string* substitute) const override {
     if (placeholder == ::onc::substitutes::kLoginIDField)
       *substitute = user_->GetAccountName(false);
     else if (placeholder == ::onc::substitutes::kEmailField)
-      *substitute = user_->email();
+      *substitute = user_->GetUserID().GetUserEmail();
     else
       return false;
     return true;
   }
 
  private:
   const user_manager::User* user_;
 
   DISALLOW_COPY_AND_ASSIGN(UserStringSubstitution);
 };
@@ skipping 277 matching lines @@
                          const PrefService* local_state_prefs,
                          const NetworkState& network) {
   ::onc::ONCSource ignored_onc_source;
   const base::DictionaryValue* policy = onc::GetPolicyForNetwork(
       profile_prefs, local_state_prefs, network, &ignored_onc_source);
   return policy != NULL;
 }
 
 }  // namespace onc
 }  // namespace chromeos