[Proximity Auth] Create one ProximityAuthClient per profile, rather than one global one.

chrome/browser/signin/easy_unlock_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_
 
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/signin/chrome_proximity_auth_client.h"
 #include "chrome/browser/signin/easy_unlock_auth_attempt.h"
 #include "chrome/browser/signin/easy_unlock_metrics.h"
 #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/proximity_auth/screenlock_state.h"
 #include "components/proximity_auth/webui/proximity_auth_ui_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
 #endif
@@ skipping 192 matching lines @@
   void RecordClickOnLockIcon();
 
   void AddObserver(EasyUnlockServiceObserver* observer);
   void RemoveObserver(EasyUnlockServiceObserver* observer);
 
   // ProximityAuthUIDelegate:
   scoped_ptr<proximity_auth::CryptAuthClientFactory>
   CreateCryptAuthClientFactory() override;
   cryptauth::DeviceClassifier GetDeviceClassifier() override;
 
+  ChromeProximityAuthClient* proximity_auth_client() {
+    return &proximity_auth_client_;
+  }
+
  protected:
   explicit EasyUnlockService(Profile* profile);
   ~EasyUnlockService() override;
 
   // Does a service type specific initialization.
   virtual void InitializeInternal() = 0;
 
   // Does a service type specific shutdown. Called from |Shutdown|.
   virtual void ShutdownInternal() = 0;
 
@@ skipping 83 matching lines @@
       const std::set<std::string> paired_devices,
       bool success,
       const chromeos::EasyUnlockDeviceKeyDataList& key_data_list);
 #endif
 
   // Updates the service to state for handling system suspend.
   void PrepareForSuspend();
 
   void EnsureTpmKeyPresentIfNeeded();
 
-  Profile* profile_;
+  Profile* const profile_;
+
+  ChromeProximityAuthClient proximity_auth_client_;
 
   scoped_ptr<EasyUnlockAppManager> app_manager_;
 
   // Created lazily in |GetScreenlockStateHandler|.
   scoped_ptr<EasyUnlockScreenlockStateHandler> screenlock_state_handler_;
 
   // The handler for the current auth attempt. Set iff an auth attempt is in
   // progress.
   scoped_ptr<EasyUnlockAuthAttempt> auth_attempt_;
 
@@ skipping 16 matching lines @@
   bool tpm_key_checked_;
 
   base::ObserverList<EasyUnlockServiceObserver> observers_;
 
   base::WeakPtrFactory<EasyUnlockService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_