Merge 182894 - 3rd attempt

chrome/browser/chromeos/login/oauth_login_manager.h

Index: chrome/browser/chromeos/login/oauth_login_manager.h
===================================================================
--- chrome/browser/chromeos/login/oauth_login_manager.h	(revision 184220)
+++ chrome/browser/chromeos/login/oauth_login_manager.h	(working copy)
@@ -5,8 +5,6 @@
 #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"
@@ -45,6 +43,9 @@
    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;