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

components/proximity_auth/screenlock_bridge.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/screenlock_bridge.h"
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "components/proximity_auth/proximity_auth_client.h"
 
@@ skipping 31 matching lines @@
       return kHardlockedUserPodCustomIconId;
     case ScreenlockBridge::USER_POD_CUSTOM_ICON_SPINNER:
       return kSpinnerUserPodCustomIconId;
     default:
       return "";
   }
 }
 
 }  // namespace
 
-ScreenlockBridge::ScreenlockBridge(ProximityAuthClient* client)
-    : client_(client), lock_handler_(nullptr) {
-  DCHECK(client_);
+ScreenlockBridge::ScreenlockBridge() : lock_handler_(nullptr) {
 }
 
 ScreenlockBridge::~ScreenlockBridge() {
 }
 
 ScreenlockBridge::UserPodCustomIconOptions::UserPodCustomIconOptions()
     : autoshow_tooltip_(false),
       hardlock_on_click_(false),
       is_trial_run_(false) {
 }
@@ skipping 78 matching lines @@
   if (user_id == focused_user_id_)
     return;
   focused_user_id_ = user_id;
   FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(user_id));
 }
 
 bool ScreenlockBridge::IsLocked() const {
   return lock_handler_ != nullptr;
 }
 
-void ScreenlockBridge::Lock(content::BrowserContext* browser_context) {
+void ScreenlockBridge::Lock(ProximityAuthClient* client) {

[Tim Song, 2015/06/26 23:46:43]

Hmm... requiring the client here couples the ScreenlockBridge really tightly
with proximity_auth. I wonder if its worth having the Lock() and Unlock()
methods at all, since they only seem to be used in a small number of places.

[Ilya Sherman, 2015/06/27 08:18:00]

I removed the Lock() implementation for now, since we aren't actually using this
class on non-ChromeOS platforms for now... and we'd probably prefer to lock the
screen -- rather than Chrome -- on the other platforms anyway.

 #if defined(OS_CHROMEOS)
   chromeos::SessionManagerClient* session_manager =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   session_manager->RequestLockScreen();
 #else
-  client_->Lock(browser_context);
+  client->Lock();
 #endif
 }
 
-void ScreenlockBridge::Unlock(content::BrowserContext* browser_context) {
+void ScreenlockBridge::Unlock(ProximityAuthClient* client) {

[Tim Song, 2015/06/26 23:46:43]

I think it would be better to take the username directly as an argument.

[Ilya Sherman, 2015/06/27 08:18:00]

Done.

   if (lock_handler_)
-    lock_handler_->Unlock(client_->GetAuthenticatedUsername(browser_context));
+    lock_handler_->Unlock(client->GetAuthenticatedUsername());
 }
 
 void ScreenlockBridge::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ScreenlockBridge::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace proximity_auth