Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / identity / identity_signin_flow.cc

diff --git a/src/chrome/browser/extensions/api/identity/identity_signin_flow.cc b/src/chrome/browser/extensions/api/identity/identity_signin_flow.cc
index a0aa85e..74b5f35 100644 (file)
--- a/src/chrome/browser/extensions/api/identity/identity_signin_flow.cc
+++ b/src/chrome/browser/extensions/api/identity/identity_signin_flow.cc
@@ -5,10 +5,12 @@
 #include "chrome/browser/extensions/api/identity/identity_signin_flow.h"
 
 #include "chrome/browser/app_mode/app_mode_utils.h"
-#include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/signin/core/browser/signin_manager.h"
 
 namespace extensions {
 
@@ -43,8 +45,8 @@ void IdentitySigninFlow::Start() {
 
 void IdentitySigninFlow::OnRefreshTokenAvailable(
     const std::string& account_id) {
-  if (ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
-          GetPrimaryAccountId() == account_id) {
+  if (SigninManagerFactory::GetForProfile(profile_)->
+      GetAuthenticatedAccountId() == account_id) {
     delegate_->SigninSuccess();
   }
 }