summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-21 03:09:03 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-21 03:09:03 +0000
commit9d7e5c0883487bbc0b7dc07485bd02aad29da947 (patch)
treeee1298bee3aeda5069cc0d1459b78e1bc28a9308 /sync
parent6493366aa994c8fe9b1a00c79c9c77a42e7a10d7 (diff)
downloadchromium_src-9d7e5c0883487bbc0b7dc07485bd02aad29da947.zip
chromium_src-9d7e5c0883487bbc0b7dc07485bd02aad29da947.tar.gz
chromium_src-9d7e5c0883487bbc0b7dc07485bd02aad29da947.tar.bz2
Make GCMProfileService own GCMDriver, instead of deriving from it
Also remove several tests related to testing on neutral channel signals. Replacement tests will be added when we switch to starting and stopping GCM on demand in the future patch. BUG=356716 TEST=tests updated TBR=kalman@chromium.org,pavely@chromium.org,arv@chromium.org Review URL: https://codereview.chromium.org/286213003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/notifier/gcm_network_channel.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sync/notifier/gcm_network_channel.cc b/sync/notifier/gcm_network_channel.cc
index 654123a..59f1a57 100644
--- a/sync/notifier/gcm_network_channel.cc
+++ b/sync/notifier/gcm_network_channel.cc
@@ -421,6 +421,7 @@ std::string GCMNetworkChannelDiagnostic::GCMClientResultToString(
ENUM_CASE(gcm::GCMClient::NOT_SIGNED_IN);
ENUM_CASE(gcm::GCMClient::INVALID_PARAMETER);
ENUM_CASE(gcm::GCMClient::ASYNC_OPERATION_PENDING);
+ ENUM_CASE(gcm::GCMClient::GCM_DISABLED);
}
NOTREACHED();
return "";