diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 15:36:54 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 15:36:54 +0000 |
| commit | df84c5378331d859148ad916a706fe2d9be441fd (patch) | |
| tree | d18a4d4502bb65cadc8c310e471f5b9e0c00bd7c /sync | |
| parent | 671d33072bfcc49a6aeac7559d349e7bc0d994e9 (diff) | |
| download | chromium_src-df84c5378331d859148ad916a706fe2d9be441fd.zip chromium_src-df84c5378331d859148ad916a706fe2d9be441fd.tar.gz chromium_src-df84c5378331d859148ad916a706fe2d9be441fd.tar.bz2 | |
Extract Profile-independent GCMService from GCMProfileService
This CL moves most of the GCMProfileService functionality to a new
GCMService class that does not depend on Profile. GCMProfileService
becomes a subclass of GCMService that adds Profile-specific lifetime
management and control over the service via user preferences.
The CL is a prerequisite for Chrome OS device policy pushing, which will
need to instantiate a Tango connection using device-wide GAIA credentials
not tied to any user or Profile.
The CL also fixes a few subtle bugs, such as GCMProfileService::IOWorker
being shut down on the wrong thread and unit tests looking at the wrong
GCMProfileService when trying to verify correct behavior.
BUG=362083
TEST=Updated unit tests
R=atwilson@chromium.org, dcheng@chromium.org, jianli@chromium.org, yoz@chromium.org
Review URL: https://codereview.chromium.org/225403021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/notifier/gcm_network_channel.h | 2 | ||||
| -rw-r--r-- | sync/notifier/gcm_network_channel_delegate.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sync/notifier/gcm_network_channel.h b/sync/notifier/gcm_network_channel.h index b2b8d6c..3f2afc9 100644 --- a/sync/notifier/gcm_network_channel.h +++ b/sync/notifier/gcm_network_channel.h @@ -45,7 +45,7 @@ struct GCMNetworkChannelDiagnostic { }; // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes -// messages through GCMProfileService. +// messages through GCMService. class SYNC_EXPORT_PRIVATE GCMNetworkChannel : public SyncNetworkChannel, public net::URLFetcherDelegate, diff --git a/sync/notifier/gcm_network_channel_delegate.h b/sync/notifier/gcm_network_channel_delegate.h index ff371eb..36485a1 100644 --- a/sync/notifier/gcm_network_channel_delegate.h +++ b/sync/notifier/gcm_network_channel_delegate.h @@ -40,8 +40,8 @@ class GCMNetworkChannelDelegate { // Invalidate access token that was rejected by server. virtual void InvalidateToken(const std::string& token) = 0; - // Request registration_id from GCMProfileService. Callback should be called - // with either registration id or error code. + // Request registration_id from GCMService. Callback should be called with + // either registration id or error code. virtual void Register(RegisterCallback callback) = 0; // Provide callback for incoming messages from GCM. virtual void SetMessageReceiver(MessageCallback callback) = 0; |