Merge 176800

chrome/browser/chromeos/login/login_utils.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_UTILS_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_UTILS_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "google_apis/gaia/gaia_auth_consumer.h"
 
 class CommandLine;
 class GURL;
 class Profile;
 class PrefService;
 
 namespace {
 class BrowserGuestSessionNavigatorTest;
 }  // namespace
 
@@ skipping 41 matching lines @@
 
   // Loads and prepares profile for the session. Fires |delegate| in the end.
   // If |pending_requests| is true, there's a pending online auth request.
   // If |display_email| is not empty, user's displayed email will be set to
   // this value, shown in UI.
   // Also see DelegateDeleted method.
   virtual void PrepareProfile(
       const std::string& username,
       const std::string& display_email,
       const std::string& password,
-      bool pending_requests,
       bool using_oauth,
       bool has_cookies,
       Delegate* delegate) = 0;
 
   // Invalidates |delegate|, which was passed to PrepareProfile method call.
   virtual void DelegateDeleted(Delegate* delegate) = 0;
 
   // Invoked after the tmpfs is successfully mounted.
   // Asks session manager to restart Chrome in Browse Without Sign In mode.
   // |start_url| is url for launched browser to open.
@@ skipping 14 matching lines @@
   // TODO(nkostylev): Cleanup after WebUI login migration is complete.
   virtual scoped_refptr<Authenticator> CreateAuthenticator(
       LoginStatusConsumer* consumer) = 0;
 
   // Prewarms the authentication network connection.
   virtual void PrewarmAuthentication() = 0;
 
   // Restores authentication session after crash.
   virtual void RestoreAuthenticationSession(Profile* profile) = 0;
 
-  // Starts process of fetching OAuth2 tokens (based on OAuth1 tokens found
-  // in |user_profile|) and kicks off internal services that depend on them.
-  virtual void StartTokenServices(Profile* user_profile) = 0;
-
-  // Supply credentials for sync and others to use.
-  virtual void StartSignedInServices(
-      Profile* profile,
-      const GaiaAuthConsumer::ClientLoginResult& credentials) = 0;
-
   // Stops background fetchers.
   virtual void StopBackgroundFetchers() = 0;
 
   // Initialize RLZ.
   virtual void InitRlzDelayed(Profile* user_profile) = 0;
 
   // Completed profile creation process.
   virtual void CompleteProfileCreate(Profile* user_profile) {}
 
  protected:
   friend class ::BrowserGuestSessionNavigatorTest;
 
   // Returns command line string to be used for the OTR process. Also modifies
   // given command line.
   virtual std::string GetOffTheRecordCommandLine(
       const GURL& start_url,
       const CommandLine& base_command_line,
       CommandLine* command_line) = 0;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_UTILS_H_