[Easy Unlock] Update handling of the trial easy unlock/signin run

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/prefs/pref_registry_simple.h"
@@ skipping 153 matching lines @@
 EasyUnlockService::~EasyUnlockService() {
 }
 
 // static
 void EasyUnlockService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kEasyUnlockEnabled,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(
-      prefs::kEasyUnlockShowTutorial,
-      true,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kEasyUnlockPairing,
       new base::DictionaryValue(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kEasyUnlockAllowed,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 void EasyUnlockService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kEasyUnlockHardlockState);
 }
 
 // static
-void EasyUnlockService::RemoveHardlockStateForUser(const std::string& user_id) {
+void EasyUnlockService::ResetLocalStateForUser(const std::string& user_id) {
   DCHECK(!user_id.empty());
 
   PrefService* local_state = GetLocalState();
   if (!local_state)
     return;
 
   DictionaryPrefUpdate update(local_state, prefs::kEasyUnlockHardlockState);
   update->RemoveWithoutPathExpansion(user_id, NULL);
 }
 
@@ skipping 51 matching lines @@
 }
 
 EasyUnlockScreenlockStateHandler*
     EasyUnlockService::GetScreenlockStateHandler() {
   if (!IsAllowed())
     return NULL;
   if (!screenlock_state_handler_) {
     screenlock_state_handler_.reset(new EasyUnlockScreenlockStateHandler(
         GetUserEmail(),
         GetHardlockState(),
-        GetType() == TYPE_REGULAR ? profile_->GetPrefs() : NULL,
         ScreenlockBridge::Get()));
   }
   return screenlock_state_handler_.get();
 }
 
 bool EasyUnlockService::UpdateScreenlockState(
     EasyUnlockScreenlockStateHandler::State state) {
   EasyUnlockScreenlockStateHandler* handler = GetScreenlockStateHandler();
   if (!handler)
     return false;
@@ skipping 60 matching lines @@
 
   key_manager->GetDeviceDataList(
       chromeos::UserContext(user_id),
       base::Bind(&EasyUnlockService::OnCryptohomeKeysFetchedForChecking,
                  weak_ptr_factory_.GetWeakPtr(),
                  user_id,
                  paired_devices));
 #endif
 }
 
+void EasyUnlockService::SetTrialRun() {
+  DCHECK(GetType() == TYPE_REGULAR);
+
+  EasyUnlockScreenlockStateHandler* handler = GetScreenlockStateHandler();
+  if (handler)
+    handler->SetTrialRun();
+}
+
 void EasyUnlockService::AddObserver(EasyUnlockServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void EasyUnlockService::RemoveObserver(EasyUnlockServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void  EasyUnlockService::Shutdown() {
   if (shut_down_)
@@ skipping 175 matching lines @@
   if (!success) {
     SetHardlockStateForUser(user_id,
                             EasyUnlockScreenlockStateHandler::NO_PAIRING);
     return;
   }
 
   std::set<std::string> devices_in_cryptohome;
   for (const auto& device_key_data : key_data_list)
     devices_in_cryptohome.insert(device_key_data.public_key);
 
-  if (paired_devices != devices_in_cryptohome) {
+  if (paired_devices != devices_in_cryptohome ||
+      GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {

[xiyuan, 2014/10/09 21:03:55]

Why do we need to map NO_PAIRING to PAIRING_CHANGED?

     SetHardlockStateForUser(user_id,
                             EasyUnlockScreenlockStateHandler::PAIRING_CHANGED);
   }
 }
 #endif