summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gaia/account_tracker.cc44
-rw-r--r--google_apis/gaia/identity_provider.cc6
-rw-r--r--google_apis/gaia/oauth2_token_service.cc36
3 files changed, 1 insertions, 85 deletions
diff --git a/google_apis/gaia/account_tracker.cc b/google_apis/gaia/account_tracker.cc
index 794089a..50c4e70 100644
--- a/google_apis/gaia/account_tracker.cc
+++ b/google_apis/gaia/account_tracker.cc
@@ -6,7 +6,6 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "net/url_request/url_request_context_getter.h"
@@ -85,11 +84,6 @@ AccountIds AccountTracker::FindAccountIdsByGaiaId(const std::string& gaia_id) {
}
void AccountTracker::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 AccountTracker::OnRefreshTokenAvailable"));
-
TRACE_EVENT1("identity",
"AccountTracker::OnRefreshTokenAvailable",
"account_key",
@@ -164,11 +158,6 @@ void AccountTracker::NotifyAccountRemoved(const AccountState& account) {
}
void AccountTracker::NotifySignInChanged(const AccountState& account) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::NotifySignInChanged"));
-
DCHECK(!account.ids.gaia.empty());
FOR_EACH_OBSERVER(Observer,
observer_list_,
@@ -177,10 +166,6 @@ void AccountTracker::NotifySignInChanged(const AccountState& account) {
void AccountTracker::UpdateSignInState(const std::string account_key,
bool is_signed_in) {
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::UpdateSignInState"));
-
StartTrackingAccount(account_key);
AccountState& account = accounts_[account_key];
bool needs_gaia_id = account.ids.gaia.empty();
@@ -195,11 +180,6 @@ void AccountTracker::UpdateSignInState(const std::string account_key,
}
void AccountTracker::StartTrackingAccount(const std::string account_key) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::StartTrackingAccount"));
-
if (!ContainsKey(accounts_, account_key)) {
DVLOG(1) << "StartTracking " << account_key;
AccountState account_state;
@@ -231,38 +211,16 @@ void AccountTracker::StopTrackingAllAccounts() {
}
void AccountTracker::StartFetchingUserInfo(const std::string account_key) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::StartFetchingUserInfo"));
-
- if (ContainsKey(user_info_requests_, account_key)) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::StartFetchingUserInfo 1"));
-
+ if (ContainsKey(user_info_requests_, account_key))
DeleteFetcher(user_info_requests_[account_key]);
- }
DVLOG(1) << "StartFetching " << account_key;
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::StartFetchingUserInfo 2"));
-
AccountIdFetcher* fetcher =
new AccountIdFetcher(identity_provider_->GetTokenService(),
request_context_getter_.get(),
this,
account_key);
user_info_requests_[account_key] = fetcher;
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 AccountTracker::StartFetchingUserInfo 3"));
-
fetcher->Start();
}
diff --git a/google_apis/gaia/identity_provider.cc b/google_apis/gaia/identity_provider.cc
index 86edfb8..842891e 100644
--- a/google_apis/gaia/identity_provider.cc
+++ b/google_apis/gaia/identity_provider.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/profiler/scoped_tracker.h"
#include "google_apis/gaia/identity_provider.h"
IdentityProvider::Observer::~Observer() {}
@@ -40,11 +39,6 @@ void IdentityProvider::RemoveObserver(Observer* observer) {
}
void IdentityProvider::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 IdentityProvider::OnRefreshTokenAvailable"));
-
if (account_id != GetActiveAccountId())
return;
FOR_EACH_OBSERVER(OAuth2TokenService::Observer,
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc
index 842bea7..b0c4aa4 100644
--- a/google_apis/gaia/oauth2_token_service.cc
+++ b/google_apis/gaia/oauth2_token_service.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/time/time.h"
@@ -215,11 +214,6 @@ OAuth2TokenService::Fetcher* OAuth2TokenService::Fetcher::CreateAndStart(
scopes,
waiting_request);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 OAuth2TokenService::Fetcher::CreateAndStart"));
-
fetcher->Start();
return fetcher;
}
@@ -467,11 +461,6 @@ OAuth2TokenService::StartRequestForClientWithContext(
Consumer* consumer) {
DCHECK(CalledOnValidThread());
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 OAuth2TokenService::StartRequestForClientWithContext 1"));
-
scoped_ptr<RequestImpl> request(new RequestImpl(account_id, consumer));
FOR_EACH_OBSERVER(DiagnosticsObserver, diagnostics_observer_list_,
OnAccessTokenRequested(account_id,
@@ -479,11 +468,6 @@ OAuth2TokenService::StartRequestForClientWithContext(
scopes));
if (!RefreshTokenIsAvailable(account_id)) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 OAuth2TokenService::StartRequestForClientWithContext 2"));
-
GoogleServiceAuthError error(GoogleServiceAuthError::USER_NOT_SIGNED_UP);
FOR_EACH_OBSERVER(DiagnosticsObserver, diagnostics_observer_list_,
@@ -504,11 +488,6 @@ OAuth2TokenService::StartRequestForClientWithContext(
account_id,
scopes);
if (HasCacheEntry(request_parameters)) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 OAuth2TokenService::StartRequestForClientWithContext 3"));
-
StartCacheLookupRequest(request.get(), request_parameters, consumer);
} else {
FetchOAuth2Token(request.get(),
@@ -527,11 +506,6 @@ void OAuth2TokenService::FetchOAuth2Token(RequestImpl* request,
const std::string& client_id,
const std::string& client_secret,
const ScopeSet& scopes) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 OAuth2TokenService::FetchOAuth2Token"));
-
// If there is already a pending fetcher for |scopes| and |account_id|,
// simply register this |request| for those results rather than starting
// a new fetcher.
@@ -783,11 +757,6 @@ void OAuth2TokenService::CancelFetchers(
void OAuth2TokenService::FireRefreshTokenAvailable(
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 OAuth2TokenService::FireRefreshTokenAvailable"));
-
FOR_EACH_OBSERVER(Observer, observer_list_,
OnRefreshTokenAvailable(account_id));
}
@@ -799,11 +768,6 @@ void OAuth2TokenService::FireRefreshTokenRevoked(
}
void OAuth2TokenService::FireRefreshTokensLoaded() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422460 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422460 OAuth2TokenService::FireRefreshTokensLoaded"));
-
FOR_EACH_OBSERVER(Observer, observer_list_, OnRefreshTokensLoaded());
}
generated by cgit v1.1 at 2025-02-15 15:00:18 +0000