Revert 109826 - Re-authenticate oauth tokens after crash and restart Sync.

BUG=chromium-os:19788
TEST=See issue

Review URL: http://codereview.chromium.org/8537002

TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/8509037

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

chrome/browser/chrome_browser_main.cc

@@ -550,8 +550,8 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
   } else {
     // We did not log in (we crashed or are debugging), so we need to
     // set the user name for sync.
-    chromeos::LoginUtils::Get()->RestoreAuthenticationSession(
-        chromeos::UserManager::Get()->logged_in_user().email(), profile);
+    profile->GetProfileSyncService(
+        chromeos::UserManager::Get()->logged_in_user().email());
   }
 }
 

chrome/browser/chromeos/login/login_utils.cc

@@ -438,8 +438,6 @@ class LoginUtilsImpl : public LoginUtils,
   virtual scoped_refptr<Authenticator> CreateAuthenticator(
       LoginStatusConsumer* consumer) OVERRIDE;
   virtual void PrewarmAuthentication() OVERRIDE;
-  virtual void RestoreAuthenticationSession(const std::string& user_name,
-                                            Profile* profile) OVERRIDE;
   virtual void FetchCookies(
       Profile* profile,
       const GaiaAuthConsumer::ClientLoginResult& credentials) OVERRIDE;
@@ -481,9 +479,6 @@ class LoginUtilsImpl : public LoginUtils,
       CommandLine *command_line);
 
  private:
-  // Restarts OAuth session authentication check.
-  void KickStartAuthentication(Profile* profile);
-
   // Reads OAuth1 token from user profile's prefs.
   bool ReadOAuth1AccessToken(Profile* user_profile,
                              std::string* token,
@@ -1024,23 +1019,6 @@ void LoginUtilsImpl::PrewarmAuthentication() {
   }
 }
 
-void LoginUtilsImpl::RestoreAuthenticationSession(const std::string& username,
-                                                  Profile* user_profile) {
-  username_ = username;
-  KickStartAuthentication(user_profile);
-}
-
-void LoginUtilsImpl::KickStartAuthentication(Profile* user_profile) {
-  if (!authenticator_.get())
-    CreateAuthenticator(NULL);
-  std::string oauth1_token;
-  std::string oauth1_secret;
-  if (ReadOAuth1AccessToken(user_profile, &oauth1_token, &oauth1_secret))
-    VerifyOAuth1AccessToken(user_profile, oauth1_token, oauth1_secret);
-
-  authenticator_ = NULL;
-}
-
 void LoginUtilsImpl::SetBackgroundView(BackgroundView* background_view) {
   background_view_ = background_view;
 }
@@ -1187,7 +1165,14 @@ void LoginUtilsImpl::OnOnlineStateChanged(bool online) {
   // we need to kick of OAuth token verification process again.
   if (UserManager::Get()->user_is_logged_in() &&
       UserManager::Get()->offline_login() && online) {
-    KickStartAuthentication(ProfileManager::GetDefaultProfile());
+    if (!authenticator_.get())
+      CreateAuthenticator(NULL);
+    std::string oauth1_token;
+    std::string oauth1_secret;
+    Profile* user_profile = ProfileManager::GetDefaultProfile();
+    if (ReadOAuth1AccessToken(user_profile, &oauth1_token, &oauth1_secret))
+      VerifyOAuth1AccessToken(user_profile, oauth1_token, oauth1_secret);
+    authenticator_ = NULL;
   }
 }
 

chrome/browser/chromeos/login/login_utils.h

@@ -89,10 +89,6 @@ class LoginUtils {
   // Prewarms the authentication network connection.
   virtual void PrewarmAuthentication() = 0;
 
-  // Restores authentication session after crash.
-  virtual void RestoreAuthenticationSession(const std::string& user_name,
-                                            Profile* profile) = 0;
-
   // Given the credentials try to exchange them for
   // full-fledged Google authentication cookies.
   virtual void FetchCookies(

chrome/browser/chromeos/login/mock_authenticator.h

@@ -107,9 +107,6 @@ class MockLoginUtils : public LoginUtils {
 
   virtual void PrewarmAuthentication() {}
 
-  virtual void RestoreAuthenticationSession(const std::string& user_name,
-                                            Profile* profile) {}
-
   virtual void FetchCookies(
       Profile* profile,
       const GaiaAuthConsumer::ClientLoginResult& credentials) {}