Move screenlock_bridge to components/proximity_auth

chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc
index 1882dcb7dc2ec4d860242497517a9203fb5b1da4..29687900178fa6ba12f9397a61262758309c9e4f 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc
@@ -7,12 +7,13 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
+#include "chrome/browser/signin/easy_unlock_util.h"

[Ilya Sherman, 2015/04/24 21:22:01]

Oh, I meant to call this out in my last round of review: Let's not introduce a
generic "util" file, as they tend to become dumping grounds.  Let's give this a
more focused name -- perhaps screenlock_bridge_accessor.h, or something like
that.

[msarda, 2015/04/27 11:29:24]

I've renamed this class to proximit_auth_facade as I plan this to be the facade
for all the singleton instances of the proximity auth component. I think we need
something to manage the lifecycle of all the singleton instances (for example
ScreenlockBridge needs to outlive the ChromeProximityAuthClient and they are
both singleton objects). I'm fine to rename this class to whatever else if you
think this is needed.

 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/auth_status_consumer.h"
 #include "chromeos/login/auth/user_context.h"
+#include "components/proximity_auth/screenlock_bridge.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -74,8 +75,9 @@ class ReauthHandler : public content::NotificationObserver,
     screen_locker->SetLoginStatusConsumer(this);
 
     // Show tooltip explaining reauth.
-    ScreenlockBridge::UserPodCustomIconOptions icon_options;
-    icon_options.SetIcon(ScreenlockBridge::USER_POD_CUSTOM_ICON_NONE);
+    proximity_auth::ScreenlockBridge::UserPodCustomIconOptions icon_options;
+    icon_options.SetIcon(
+        proximity_auth::ScreenlockBridge::USER_POD_CUSTOM_ICON_NONE);
     icon_options.SetTooltip(
         l10n_util::GetStringUTF16(
             IDS_SMART_LOCK_SCREENLOCK_TOOLTIP_HARDLOCK_REAUTH_USER),
@@ -83,7 +85,7 @@ class ReauthHandler : public content::NotificationObserver,
 
     const user_manager::UserList& lock_users = screen_locker->users();
     DCHECK(lock_users.size() == 1);
-    ScreenlockBridge::Get()->lock_handler()->ShowUserPodCustomIcon(
+    GetScreenlockBridgeInstance()->lock_handler()->ShowUserPodCustomIcon(
         lock_users[0]->email(), icon_options);
   }