Correctly deal with tokens for supervised users in ProfileOAuth2TokenService.

chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.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/login/managed/locally_managed_user_login_flow.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 53 matching lines @@
   return false;
 }
 
 void LocallyManagedUserLoginFlow::HandleOAuthTokenStatusChange(
     User::OAuthTokenStatus status) {
 }
 
 void LocallyManagedUserLoginFlow::OnSyncSetupDataLoaded(
     const std::string& token) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // TODO(antrim): add error handling (no token loaded).
   ConfigureSync(token);
 }
 
 void LocallyManagedUserLoginFlow::ConfigureSync(const std::string& token) {
   data_loaded_ = true;
-  ManagedUserServiceFactory::GetForProfile(profile_)->InitSync(token);
+  // TODO(antrim): add error handling (no token loaded).
+  // See also: http://crbug.com/312751
+  if (!token.empty())
+    ManagedUserServiceFactory::GetForProfile(profile_)->InitSync(token);
+
   LoginUtils::Get()->DoBrowserLaunch(profile_, host());
   profile_ = NULL;
   UnregisterFlowSoon();
 }
 
 void LocallyManagedUserLoginFlow::LaunchExtraSteps(
     Profile* profile) {
   profile_ = profile;
   const std::string token;
   if (token.empty()) {
     PostTaskAndReplyWithResult(
         content::BrowserThread::GetBlockingPool(),
         FROM_HERE,
         base::Bind(&LoadSyncToken),
         base::Bind(
              &LocallyManagedUserLoginFlow::OnSyncSetupDataLoaded,
              weak_factory_.GetWeakPtr()));
   } else {
     ConfigureSync(token);
   }
 }
 
 }  // namespace chromeos