Just some cleanup before I start on the profile name fix.

components/signin/core/browser/signin_manager.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/signin/core/browser/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/prefs/pref_service.h"
@@ skipping 179 matching lines @@
     return;
   }
 
   if (prohibit_signout_) {
     DVLOG(1) << "Ignoring attempt to sign out while signout is prohibited";
     return;
   }
 
   ClearTransientSigninData();
 
-  const std::string& username = GetAuthenticatedUsername();
+  const std::string username = GetAuthenticatedUsername();
   clear_authenticated_username();
   client_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
 
   // Erase (now) stale information from AboutSigninInternals.
   NotifyDiagnosticsObservers(USERNAME, "");
 
   // Revoke all tokens before sending signed_out notification, because there
   // may be components that don't listen for token service events when the
   // profile is not connected to an account.
   LOG(WARNING) << "Revoking refresh token on server. Reason: sign out, "
@@ skipping 150 matching lines @@
 
   password_.clear();                           // Don't need it anymore.
   DisableOneClickSignIn(client_->GetPrefs());  // Don't ever offer again.
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const { return prohibit_signout_; }