OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/oauth_login_manager.h

 // Copyright (c) 2013 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_OAUTH_LOGIN_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH_LOGIN_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 27 matching lines @@
     // Restore session from OAuth2 refresh token passed via command line.
     RESTORE_FROM_PASSED_OAUTH2_REFRESH_TOKEN,
     // Restore session from authentication code passed via command line.
     RESTORE_FROM_AUTH_CODE,
   };
 
   class Delegate {
    public:
     virtual ~Delegate() {}
 
+    // Raised when merge session process starts.
+    virtual void OnStartMergeSession(Profile* user_profile) = 0;
+
     // Raised when merge session is completed.
     virtual void OnCompletedMergeSession() = 0;
 
     // Raised when cookie jar authentication is successfully completed.
     virtual void OnCompletedAuthentication(Profile* user_profile) = 0;
 
     // Raised when stored OAuth(1|2) tokens are found and authentication
     // profile is no longer needed.
     virtual void OnFoundStoredTokens() = 0;
   };
@@ skipping 36 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> auth_request_context_;
   SessionRestoreStrategy restore_strategy_;
   SessionRestoreState state_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuthLoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH_LOGIN_MANAGER_H_