Merge 182894 - 3rd attempt

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"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/oauth1_login_verifier.h"
 #include "chrome/browser/chromeos/login/oauth1_token_fetcher.h"
 #include "chrome/browser/chromeos/login/oauth2_login_verifier.h"
 #include "chrome/browser/chromeos/login/oauth2_policy_fetcher.h"
 #include "chrome/browser/chromeos/login/oauth2_token_fetcher.h"
 #include "chrome/browser/chromeos/login/policy_oauth_fetcher.h"
@@ skipping 18 matching lines @@
     // stored OAuth tokens and populate cookie jar with GAIA credentials.
     SESSION_RESTORE_IN_PROGRESS,
     // Session restore is completed.
     SESSION_RESTORE_DONE,
   };
 
   class Delegate {
    public:
     virtual ~Delegate() {}
 
+    // 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;
 
     // Raised when policy tokens are retrieved.
     virtual void OnRestoredPolicyTokens() {}
   };
@@ skipping 34 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> auth_request_context_;
   bool restore_from_auth_cookies_;
   SessionRestoreState state_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuthLoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH_LOGIN_MANAGER_H_