Adding pref to store the user-selected proximity threshold.

components/proximity_auth/proximity_auth_system.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 "components/proximity_auth/proximity_auth_system.h"
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/default_clock.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "components/proximity_auth/proximity_auth_client.h"
 #include "components/proximity_auth/proximity_auth_pref_manager.h"
 #include "components/proximity_auth/remote_device_life_cycle_impl.h"
 #include "components/proximity_auth/unlock_manager_impl.h"
 
 namespace proximity_auth {
 
 namespace {
 
 // The maximum number of hours permitted before the user is forced is use their
 // password to authenticate.
 const int64_t kPasswordReauthPeriodHours = 20;
 
 }  // namespace
 
 ProximityAuthSystem::ProximityAuthSystem(
     ScreenlockType screenlock_type,
     ProximityAuthClient* proximity_auth_client)
     : screenlock_type_(screenlock_type),
       proximity_auth_client_(proximity_auth_client),
-      unlock_manager_(
-          new UnlockManagerImpl(screenlock_type, proximity_auth_client)),
       clock_(new base::DefaultClock()),
       pref_manager_(new ProximityAuthPrefManager(
           proximity_auth_client->GetPrefService())),
+      unlock_manager_(new UnlockManagerImpl(screenlock_type,
+                                            proximity_auth_client_,
+                                            pref_manager_.get())),
       suspended_(false),
       started_(false),
       weak_ptr_factory_(this) {}
 
 ProximityAuthSystem::ProximityAuthSystem(
     ScreenlockType screenlock_type,
     ProximityAuthClient* proximity_auth_client,
     std::unique_ptr<UnlockManager> unlock_manager,
     std::unique_ptr<base::Clock> clock,
     std::unique_ptr<ProximityAuthPrefManager> pref_manager)
     : screenlock_type_(screenlock_type),
       proximity_auth_client_(proximity_auth_client),
-      unlock_manager_(std::move(unlock_manager)),
       clock_(std::move(clock)),
       pref_manager_(std::move(pref_manager)),
+      unlock_manager_(std::move(unlock_manager)),
       suspended_(false),
       started_(false),
       weak_ptr_factory_(this) {}
 
 ProximityAuthSystem::~ProximityAuthSystem() {
   ScreenlockBridge::Get()->RemoveObserver(this);
   unlock_manager_->SetRemoteDeviceLifeCycle(nullptr);
 }
 
 void ProximityAuthSystem::Start() {
@@ skipping 145 matching lines @@
     PA_LOG(ERROR) << "Invalid last password timestamp: now=" << now_ms
                   << ", last_password=" << last_password_ms;
     return true;
   }
 
   return base::TimeDelta::FromMilliseconds(now_ms - last_password_ms) >
          base::TimeDelta::FromHours(kPasswordReauthPeriodHours);
 }
 
 }  // proximity_auth