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

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 "apps/app_lifetime_monitor.h"
 #include "apps/app_lifetime_monitor_factory.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/chrome_proximity_auth_client.h"
+#include "chrome/browser/signin/chrome_proximity_auth_client_factory.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
 #include "chrome/browser/signin/easy_unlock_service_factory.h"
 #include "chrome/browser/signin/easy_unlock_service_observer.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/proximity_auth_facade.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
@@ skipping 653 matching lines @@
     EnsureTpmKeyPresentIfNeeded();
     app_manager_->LoadApp();
     NotifyUserUpdated();
 
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery) &&
         GetType() == EasyUnlockService::TYPE_REGULAR &&
         !proximity_auth_ble_system_) {
       proximity_auth_ble_system_.reset(
           new proximity_auth::ProximityAuthBleSystem(
-              GetScreenlockBridgeInstance(), profile_,
+              GetScreenlockBridgeInstance(),
+              ChromeProximityAuthClientFactory::GetForProfile(profile_),
               CreateCryptAuthClientFactory()));
     }
 
 #if defined(OS_CHROMEOS)
     if (!power_monitor_)
       power_monitor_.reset(new PowerMonitor(this));
 #endif
   } else {
     bool bluetooth_waking_up = false;
 #if defined(OS_CHROMEOS)
@@ skipping 201 matching lines @@
 
   // TODO(tbarzic): Set check_private_key only if previous sign-in attempt
   // failed.
   EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_)
       ->PrepareTpmKey(true /* check_private_key */,
                       base::Closure());
 #endif  // defined(OS_CHROMEOS)
 
   tpm_key_checked_ = true;
 }