Pass errors generated during limited-user registration up to the UI for display.

chrome/browser/managed_mode/managed_user_registration_service.cc

 // Copyright 2013 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/managed_mode/managed_user_registration_service.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
@@ skipping 89 matching lines @@
     SyncError error =
         sync_processor_->ProcessSyncChanges(FROM_HERE, change_list);
     DCHECK(!error.IsSet()) << error.ToString();
   }
 
   callback_ = callback;
   OnReceivedToken("abcdef");  // TODO(bauerb): This is a stub implementation.
 }
 
 ProfileManager::CreateCallback
-ManagedUserRegistrationService::GetRegistrationAndInitCallback() {
+ManagedUserRegistrationService::GetRegistrationAndInitCallback(
+    const ProfileManager::CreateCallback& callback) {

[Bernhard Bauer, 2013/06/03 10:52:47]

I wonder if we still need this now that our client is guaranteed not to outlive
us?

[Pam (message me for reviews), 2013/06/03 13:39:28]

Cleaned up following our live discussion. Thanks, I like the new way better,
letting ManagedUserService handle interactions with
ManagedUserRegistrationService and making what's going on more apparent in the
BrowserOptionsHandler.

   return base::Bind(&ManagedUserRegistrationService::OnProfileCreated,
-                    weak_ptr_factory_.GetWeakPtr());
+                    weak_ptr_factory_.GetWeakPtr(), callback);
 }
 
 void ManagedUserRegistrationService::Shutdown() {
   CancelPendingRegistration();
 }
 
 SyncMergeResult ManagedUserRegistrationService::MergeDataAndStartSyncing(
     ModelType type,
     const SyncDataList& initial_sync_data,
     scoped_ptr<SyncChangeProcessor> sync_processor,
@@ skipping 180 matching lines @@
     return;
 
   callback_.Run(error, pending_managed_user_token_);
   callback_.Reset();
   pending_managed_user_token_.clear();
   pending_managed_user_id_.clear();
   pending_managed_user_acknowledged_ = false;
 }
 
 void ManagedUserRegistrationService::OnProfileCreated(
+    const ProfileManager::CreateCallback& callback,
     Profile* profile,
     Profile::CreateStatus status) {
   // We're being called back twice: once after the profile has been created on
   // disk, and once after all the profile services (including the
-  // ManagedUserService) have been initialized. Ignore the first one.
+  // ManagedUserService) have been initialized. Ignore the first one, as well as
+  // any failure statuses.
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
 
   ManagedUserService* managed_user_service =
       ManagedUserServiceFactory::GetForProfile(profile);
   DCHECK(managed_user_service->ProfileIsManaged());
-  managed_user_service->RegisterAndInitSync(this);
+  managed_user_service->RegisterAndInitSync(this, callback);
 }