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

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2011 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/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 532 matching lines @@
     browser::ShowLoginWizard(first_screen, size);
   } else if (parsed_command_line.HasSwitch(switches::kLoginUser) &&
       parsed_command_line.HasSwitch(switches::kLoginPassword)) {
     chromeos::BootTimesLoader::Get()->RecordLoginAttempted();
     new StubLogin(
         parsed_command_line.GetSwitchValueASCII(switches::kLoginUser),
         parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword));
   } 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());
   }
 }
 
 #else
 
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
                                        Profile* profile) {
   // Dummy empty function for non-ChromeOS builds to avoid extra ifdefs below.
 }
 
@@ skipping 1519 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }