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

components/proximity_auth/screenlock_bridge.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 COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_
 #define COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 
-namespace content {
-class BrowserContext;
-}  // namespace content
-
 namespace proximity_auth {
 
-class ProximityAuthClient;
-
 // ScreenlockBridge brings together the screenLockPrivate API and underlying
 // support. On ChromeOS, it delegates calls to the ScreenLocker. On other
 // platforms, it delegates calls to UserManagerUI (and friends).
 // TODO(tbarzic): Rename ScreenlockBridge to SignInScreenBridge, as this is not
 // used solely for the lock screen anymore.
 class ScreenlockBridge {
  public:
-  // |client| is not owned and must outlive this object.
-  explicit ScreenlockBridge(ProximityAuthClient* client);
+  ScreenlockBridge();
   ~ScreenlockBridge();
 
   // User pod icons supported by lock screen / signin screen UI.
   enum UserPodCustomIcon {
     USER_POD_CUSTOM_ICON_NONE,
     USER_POD_CUSTOM_ICON_HARDLOCKED,
     USER_POD_CUSTOM_ICON_LOCKED,
     USER_POD_CUSTOM_ICON_LOCKED_TO_BE_ACTIVATED,
     // TODO(isherman): The "locked with proximity hint" icon is currently the
     // same as the "locked" icon. It's treated as a separate case to allow an
@@ skipping 114 matching lines @@
     virtual void OnFocusedUserChanged(const std::string& user_id) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   void SetLockHandler(LockHandler* lock_handler);
   void SetFocusedUser(const std::string& user_id);
 
   bool IsLocked() const;
-  void Lock(content::BrowserContext* browser_context);
-  void Unlock(content::BrowserContext* browser_context);
+  void Lock();
+  void Unlock(const std::string& user_email);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   LockHandler* lock_handler() { return lock_handler_; }
 
   std::string focused_user_id() const { return focused_user_id_; }
 
  private:
-  ProximityAuthClient* client_;  // Not owned. Must outlive this object.
   LockHandler* lock_handler_;    // Not owned
   // The last focused user's id.
   std::string focused_user_id_;
   base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockBridge);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_