easy-unlock: Turn on by default.

chrome/browser/signin/easy_unlock_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/easy_unlock_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 53 matching lines @@
   if (!profile)
     return NULL;
   return EasyUnlockService::Get(profile);
 #else
   return NULL;
 #endif
 }
 
 // static
 bool EasyUnlockService::IsSignInEnabled() {
-  // Note: It's important to query the field trial state first, to ensure that
-  // UMA reports the correct group.
-  const std::string group = base::FieldTrialList::FindFullName("EasySignIn");
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          proximity_auth::switches::kDisableEasySignin)) {
-    return false;
-  }
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          proximity_auth::switches::kEnableEasySignin)) {
-    return true;
-  }
-
-  return group == "Enable";
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      proximity_auth::switches::kDisableEasySignin);
 }
 
 class EasyUnlockService::BluetoothDetector
     : public device::BluetoothAdapter::Observer {
  public:
   explicit BluetoothDetector(EasyUnlockService* service)
       : service_(service),
         weak_ptr_factory_(this) {
   }
 
@@ skipping 132 matching lines @@
     return;
 
   DictionaryPrefUpdate update(local_state, prefs::kEasyUnlockHardlockState);
   update->RemoveWithoutPathExpansion(user_id, NULL);
 }
 
 bool EasyUnlockService::IsAllowed() {
   if (shut_down_)
     return false;
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          proximity_auth::switches::kDisableEasyUnlock)) {
+    return false;
+  }
+
   if (!IsAllowedInternal())
     return false;
 
 #if defined(OS_CHROMEOS)
   if (!bluetooth_detector_->IsPresent())
     return false;
 
   return true;
 #else
   // TODO(xiyuan): Revisit when non-chromeos platforms are supported.
@@ skipping 401 matching lines @@
 }
 #endif
 
 void EasyUnlockService::PrepareForSuspend() {
   DisableAppIfLoaded();
   if (screenlock_state_handler_ && screenlock_state_handler_->IsActive()) {
     UpdateScreenlockState(
         EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING);
   }
 }