Move screenlock_bridge to components/proximity_auth

chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 41 matching lines @@
     bool is_screen_locked = *content::Details<bool>(details).ptr();
     DCHECK(is_screen_locked);
     notification_registrar_.RemoveAll();
 
     // TODO(tengs): Add an explicit reauth state to the locker and account
     // picker, so we can customize the UI.
     ScreenLocker* screen_locker = ScreenLocker::default_screen_locker();
     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),
         true);
 
     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);
   }
 
   // chromeos::AuthStatusConsumer:
   void OnAuthSuccess(const chromeos::UserContext& user_context) override {
     callback_.Run(user_context);
     // Schedule deletion.
     base::MessageLoopForUI::current()->PostTask(FROM_HERE,
                                                 base::Bind(&EndReauthAttempt));
   }
@@ skipping 23 matching lines @@
     base::Callback<void(const UserContext&)> callback) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   if (g_reauth_handler)
     return false;
 
   g_reauth_handler = new ReauthHandler(callback);
   return g_reauth_handler->Start();
 }
 
 }  // namespace chromeos