| Index: components/gcm_driver/instance_id/instance_id_driver.cc
|
| diff --git a/components/gcm_driver/instance_id/instance_id_driver.cc b/components/gcm_driver/instance_id/instance_id_driver.cc
|
| index edb5270ff0bd2868bc1b28425522f5c48c4ef4c2..3377b3bcb55b9dd012d34a5b7ab4738573f5b139 100644
|
| --- a/components/gcm_driver/instance_id/instance_id_driver.cc
|
| +++ b/components/gcm_driver/instance_id/instance_id_driver.cc
|
| @@ -4,26 +4,17 @@
|
|
|
| #include "components/gcm_driver/instance_id/instance_id_driver.h"
|
|
|
| -#include "base/metrics/field_trial.h"
|
| #include "components/gcm_driver/instance_id/instance_id.h"
|
|
|
| namespace instance_id {
|
|
|
| -namespace {
|
| -#if !defined(OS_ANDROID)
|
| -const char kInstanceIDFieldTrialName[] = "InstanceID";
|
| -const char kInstanceIDFieldTrialEnabledGroupName[] = "Enabled";
|
| -#endif // !defined(OS_ANDROID)
|
| -} // namespace
|
| -
|
| // static
|
| bool InstanceIDDriver::IsInstanceIDEnabled() {
|
| #if defined(OS_ANDROID)
|
| - return true;
|
| + // Not implemented yet.
|
| + return false;
|
| #else
|
| - std::string group_name =
|
| - base::FieldTrialList::FindFullName(kInstanceIDFieldTrialName);
|
| - return group_name == kInstanceIDFieldTrialEnabledGroupName;
|
| + return true;
|
| #endif // defined(OS_ANDROID)
|
| }
|
|
|
|
|