Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/chromeos/policy/consumer_management_service.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 "chrome/browser/chromeos/policy/consumer_management_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
 
 // Desktop notification constants.
 const char kEnrollmentNotificationId[] = "consumer_management.enroll";
 const char kEnrollmentNotificationUrl[] = "chrome://consumer-management/enroll";
 
 // The path to the consumer management enrollment/unenrollment confirmation
 // overlay, relative to the settings page URL.
 const char kConsumerManagementOverlay[] = "consumer-management-overlay";
 
   // Returns the account ID signed in to |profile|.
-const std::string& GetAccountIdFromProfile(Profile* profile) {
+std::string GetAccountIdFromProfile(Profile* profile) {
   return SigninManagerFactory::GetForProfile(profile)->
       GetAuthenticatedAccountId();
 }
 
 class DesktopNotificationDelegate : public NotificationDelegate {
  public:
   // |button_click_callback| is called when the button in the notification is
   // clicked.
   DesktopNotificationDelegate(const std::string& id,
                               const base::Closure& button_click_callback);
@@ skipping 445 matching lines @@
   chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 void ConsumerManagementService::NotifyStatusChanged() {
   FOR_EACH_OBSERVER(Observer, observers_, OnConsumerManagementStatusChanged());
 }
 
 }  // namespace policy