Revert 81394 (broke sync_integration_tests and clang) - This CL implements alternative asynchronous methods for profile and preferences loading.BUG=chromium-os:11104TEST=UserProfileGotten (see "/tmp/login-times-sent") time doesn't increase, while UI jankness decreases.Review URL: http://codereview.chromium.org/6716025

TBR=altimofeev@chromium.org
Review URL: http://codereview.chromium.org/6834021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81396 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 13 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 6c5a59b..746ae30 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -955,8 +955,7 @@ void InitializeToolkit(const MainFunctionParams& parameters) {
 
 // Class is used to login using passed username and password.
 // The instance will be deleted upon success or failure.
-class StubLogin : public chromeos::LoginStatusConsumer,
-                  public chromeos::LoginUtils::Delegate {
+class StubLogin : public chromeos::LoginStatusConsumer {
  public:
   explicit StubLogin(std::string username, std::string password) {
     authenticator_ = chromeos::LoginUtils::Get()->CreateAuthenticator(this);
@@ -977,17 +976,10 @@ class StubLogin : public chromeos::LoginStatusConsumer,
                       const std::string& password,
                       const GaiaAuthConsumer::ClientLoginResult& credentials,
                       bool pending_requests) {
-    // Will call OnProfilePrepared in the end.
-    chromeos::LoginUtils::Get()->PrepareProfile(username,
-                                                password,
-                                                credentials,
-                                                pending_requests,
-                                                this);
-  }
-
-  // LoginUtils::Delegate implementation:
-  virtual void OnProfilePrepared(Profile* profile) {
-    chromeos::LoginUtils::DoBrowserLaunch(profile);
+    chromeos::LoginUtils::Get()->CompleteLogin(username,
+                                               password,
+                                               credentials,
+                                               pending_requests);
     delete this;
   }