Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / signin / core / browser / signin_account_id_helper.cc

diff --git a/src/components/signin/core/browser/signin_account_id_helper.cc b/src/components/signin/core/browser/signin_account_id_helper.cc
index f6f3ae9..52dab78 100644 (file)
--- a/src/components/signin/core/browser/signin_account_id_helper.cc
+++ b/src/components/signin/core/browser/signin_account_id_helper.cc
@@ -5,6 +5,7 @@
 #include "components/signin/core/browser/signin_account_id_helper.h"
 
 #include "base/prefs/pref_service.h"
+#include "base/profiler/scoped_tracker.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/common/signin_pref_names.h"
@@ -19,19 +20,19 @@ class SigninAccountIdHelper::GaiaIdFetcher
                 ProfileOAuth2TokenService* token_service,
                 SigninManagerBase* signin_manager,
                 SigninAccountIdHelper* signin_account_id_helper);
-  virtual ~GaiaIdFetcher();
+  ~GaiaIdFetcher() override;
 
   // OAuth2TokenService::Consumer implementation.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // gaia::GaiaOAuthClient::Delegate implementation.
-  virtual void OnGetUserIdResponse(const std::string& gaia_id) OVERRIDE;
-  virtual void OnOAuthError() OVERRIDE;
-  virtual void OnNetworkError(int response_code) OVERRIDE;
+  void OnGetUserIdResponse(const std::string& gaia_id) override;
+  void OnOAuthError() override;
+  void OnNetworkError(int response_code) override;
 
  private:
   void Start();
@@ -136,6 +137,11 @@ void SigninAccountIdHelper::GoogleSignedOut(const std::string& account_id,
 
 void SigninAccountIdHelper::OnRefreshTokenAvailable(
     const std::string& account_id) {
+  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "422460 SigninAccountIdHelper::OnRefreshTokenAvailable"));
+
   if (account_id == signin_manager_->GetAuthenticatedAccountId()) {
     std::string current_gaia_id =
         client_->GetPrefs()->GetString(prefs::kGoogleServicesUserAccountId);