Restructure user-creation flow and surface errors

chrome/browser/profiles/profile_manager_browsertest.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 "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 78 matching lines @@
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   ProfileRemovalObserver observer;
 
   // We should start out with 1 profile.
   ASSERT_EQ(cache.GetNumberOfProfiles(), 1U);
 
   // Delete singleton profile.
   base::FilePath singleton_profile_path = cache.GetPathOfProfileAtIndex(0);
   EXPECT_FALSE(singleton_profile_path.empty());
   profile_manager->ScheduleProfileForDeletion(singleton_profile_path,
-                                              chrome::HOST_DESKTOP_TYPE_NATIVE);
+                                              ProfileManager::CreateCallback());
 
   // Spin things till profile is actually deleted.
   content::RunAllPendingInMessageLoop();
 
   // Make sure a new profile was created automatically.
   EXPECT_EQ(cache.GetNumberOfProfiles(), 1U);
   base::FilePath new_profile_path = cache.GetPathOfProfileAtIndex(0);
   EXPECT_NE(new_profile_path, singleton_profile_path);
 
   // Make sure that last used profile preference is set correctly.
@@ skipping 25 matching lines @@
   content::RunMessageLoop();
 
   ASSERT_EQ(cache.GetNumberOfProfiles(), 2U);
 
   // Delete all profiles.
   base::FilePath profile_path1 = cache.GetPathOfProfileAtIndex(0);
   base::FilePath profile_path2 = cache.GetPathOfProfileAtIndex(1);
   EXPECT_FALSE(profile_path1.empty());
   EXPECT_FALSE(profile_path2.empty());
   profile_manager->ScheduleProfileForDeletion(profile_path1,
-                                              chrome::HOST_DESKTOP_TYPE_NATIVE);
+                                              ProfileManager::CreateCallback());
   profile_manager->ScheduleProfileForDeletion(profile_path2,
-                                              chrome::HOST_DESKTOP_TYPE_NATIVE);
+                                              ProfileManager::CreateCallback());
 
   // Spin things so deletion can take place.
   content::RunAllPendingInMessageLoop();
 
   // Make sure a new profile was created automatically.
   EXPECT_EQ(cache.GetNumberOfProfiles(), 1U);
   base::FilePath new_profile_path = cache.GetPathOfProfileAtIndex(0);
   EXPECT_NE(new_profile_path, profile_path1);
   EXPECT_NE(new_profile_path, profile_path2);
 
@@ skipping 10 matching lines @@
 
   ASSERT_EQ(profile_manager->GetNumberOfProfiles(), 1U);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 1U);
 
   // Create a profile, make sure callback is invoked before any callbacks are
   // invoked (so they can do things like sign in the profile, etc).
   ProfileManager::CreateMultiProfileAsync(
       string16(), // name
       string16(), // icon url
       base::Bind(ProfileCreationComplete),
-      chrome::GetActiveDesktop(),
       false);
   // Wait for profile to finish loading.
   content::RunMessageLoop();
   EXPECT_EQ(profile_manager->GetNumberOfProfiles(), 2U);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 2U);
 
   // Now close all browser windows.
   std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles();
   for (std::vector<Profile*>::const_iterator it = profiles.begin();
        it != profiles.end(); ++it) {
     BrowserList::CloseAllBrowsersWithProfile(*it);
   }
 }