diff options
| author | danakj <danakj@chromium.org> | 2015-09-24 00:53:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-24 07:53:38 +0000 |
| commit | 8c3eb804c56b7173f00e58e040f47fe867dabda7 (patch) | |
| tree | 3dee4211092c1942e4eaf24684f3255cfddd9e34 /google_apis | |
| parent | f7033f79311149ae641bcaa3986c753f60f1db7e (diff) | |
| download | chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.zip chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.gz chromium_src-8c3eb804c56b7173f00e58e040f47fe867dabda7.tar.bz2 | |
base: Template methods on Timer classes instead of the classes themselves.
The base class for OneShotTimer and DelayedTimer is templated but
only the Start method needs to be (which has a TODO to make it go away
entirely too).
The DelayedTimer class is also templated but only its constructor
needs to be, and the type can be inferred at the callsite, so less
typing all around.
R=thakis@chromium.org
TBR=sky,brettw
BUG=148832
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1355063004
Cr-Commit-Position: refs/heads/master@{#350496}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/oauth2_token_service.cc | 2 | ||||
| -rw-r--r-- | google_apis/gaia/ubertoken_fetcher.h | 2 | ||||
| -rw-r--r-- | google_apis/gcm/engine/connection_handler_impl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc index 01e5d96..0c7519b 100644 --- a/google_apis/gaia/oauth2_token_service.cc +++ b/google_apis/gaia/oauth2_token_service.cc @@ -172,7 +172,7 @@ class OAuth2TokenService::Fetcher : public OAuth2AccessTokenConsumer { std::vector<base::WeakPtr<RequestImpl> > waiting_requests_; int retry_number_; - base::OneShotTimer<Fetcher> retry_timer_; + base::OneShotTimer retry_timer_; scoped_ptr<OAuth2AccessTokenFetcher> fetcher_; // Variables that store fetch results. diff --git a/google_apis/gaia/ubertoken_fetcher.h b/google_apis/gaia/ubertoken_fetcher.h index ade53cc..5601746 100644 --- a/google_apis/gaia/ubertoken_fetcher.h +++ b/google_apis/gaia/ubertoken_fetcher.h @@ -91,7 +91,7 @@ class UbertokenFetcher : public GaiaAuthConsumer, std::string account_id_; std::string access_token_; int retry_number_; - base::OneShotTimer<UbertokenFetcher> retry_timer_; + base::OneShotTimer retry_timer_; bool second_access_token_request_; DISALLOW_COPY_AND_ASSIGN(UbertokenFetcher); diff --git a/google_apis/gcm/engine/connection_handler_impl.h b/google_apis/gcm/engine/connection_handler_impl.h index 399b397..e2702c0 100644 --- a/google_apis/gcm/engine/connection_handler_impl.h +++ b/google_apis/gcm/engine/connection_handler_impl.h @@ -93,7 +93,7 @@ class GCM_EXPORT ConnectionHandlerImpl : public ConnectionHandler { // TODO(zea): consider enforcing a separate timeout when waiting for // a message to send. const base::TimeDelta read_timeout_; - base::OneShotTimer<ConnectionHandlerImpl> read_timeout_timer_; + base::OneShotTimer read_timeout_timer_; // This connection's socket and the input/output streams attached to it. net::StreamSocket* socket_; |