Index: chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc |
diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc b/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc |
index 47a6f3a06ca398a748512b1369e86e658217662e..dc80f364d99561afc9a4df06b7da5ba6e621ccf3 100644 |
--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc |
+++ b/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc |
@@ -19,10 +19,12 @@ bool InstanceIDProfileService::IsInstanceIDEnabled(Profile* profile) { |
if (!gcm::GCMProfileService::IsGCMEnabled(profile)) |
return false; |
- // Enabled for trunk build. |
+ // Enabled only for trunk/canary/dev builds. |
chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
- if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN) |
- return true; |
+ if (channel == chrome::VersionInfo::CHANNEL_BETA || |
+ channel == chrome::VersionInfo::CHANNEL_STABLE) { |
+ return false; |
+ } |
not at google - send to devlin
2015/05/15 23:07:26
you could also grab the API Feature and check agai
jianli
2015/05/15 23:11:37
InstanceIDProfileService might be used by others,
|
return InstanceIDDriver::IsInstanceIDEnabled(); |
} |