Smart Lock: Remove unused EasyUnlockReauth.

R=hansberry@chromium.org

Bug: 899324
Test: none
Change-Id: I4d1f6b4f7eec6ec938360dd955ce37b9df4a5914
Reviewed-on: https://chromium-review.googlesource.com/c/1325031Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606258}

chrome/browser/chromeos/BUILD.gn

@@ -1020,8 +1020,6 @@ source_set("chromeos") {
     "login/easy_unlock/easy_unlock_metrics.h",
     "login/easy_unlock/easy_unlock_notification_controller.cc",
     "login/easy_unlock/easy_unlock_notification_controller.h",
-    "login/easy_unlock/easy_unlock_reauth.cc",
-    "login/easy_unlock/easy_unlock_reauth.h",
     "login/easy_unlock/easy_unlock_refresh_keys_operation.cc",
     "login/easy_unlock/easy_unlock_refresh_keys_operation.h",
     "login/easy_unlock/easy_unlock_remove_keys_operation.cc",

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 "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
-
-#include "base/bind.h"
-#include "base/location.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/lock/screen_locker.h"
-#include "chrome/grit/generated_resources.h"
-#include "chromeos/components/proximity_auth/screenlock_bridge.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 "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 {
-
-void EndReauthAttempt();
-
-// Performs the actual reauth flow and returns the user context it obtains.
-class ReauthHandler : public content::NotificationObserver,
-                      public AuthStatusConsumer {
- public:
-  explicit ReauthHandler(EasyUnlockReauth::UserContextCallback callback)
-      : callback_(callback) {}
-
-  ~ReauthHandler() override {}
-
-  bool Start() {
-    ScreenLocker* screen_locker = ScreenLocker::default_screen_locker();
-    if (screen_locker && screen_locker->locked()) {
-      NOTREACHED();
-      return false;
-    }
-
-    user_manager::UserManager* user_manager = user_manager::UserManager::Get();
-    if (user_manager->GetPrimaryUser() != user_manager->GetActiveUser() ||
-        user_manager->GetUnlockUsers().size() != 1) {
-      LOG(WARNING) << "Only primary users in non-multiprofile sessions are "
-                   << "currently supported for reauth.";
-      return false;
-    }
-
-    notification_registrar_.Add(this,
-                                chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-                                content::NotificationService::AllSources());
-
-    SessionManagerClient* session_manager =
-        DBusThreadManager::Get()->GetSessionManagerClient();
-    session_manager->RequestLockScreen();
-    return true;
-  }
-
-  // content::NotificationObserver
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override {
-    CHECK(type == chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED);
-    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.
-    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);
-    proximity_auth::ScreenlockBridge::Get()
-        ->lock_handler()
-        ->ShowUserPodCustomIcon(lock_users[0]->GetAccountId(), icon_options);
-  }
-
-  // AuthStatusConsumer:
-  void OnAuthSuccess(const UserContext& user_context) override {
-    DCHECK(base::MessageLoopForUI::IsCurrent());
-    callback_.Run(user_context);
-    // Schedule deletion.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(&EndReauthAttempt));
-  }
-
-  void OnAuthFailure(const AuthFailure& error) override {}
-
- private:
-  content::NotificationRegistrar notification_registrar_;
-  EasyUnlockReauth::UserContextCallback callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(ReauthHandler);
-};
-
-ReauthHandler* g_reauth_handler = NULL;
-
-void EndReauthAttempt() {
-  DCHECK(base::MessageLoopForUI::IsCurrent());
-  DCHECK(g_reauth_handler);
-  delete g_reauth_handler;
-  g_reauth_handler = NULL;
-}
-
-}  // namespace
-
-// static.
-bool EasyUnlockReauth::ReauthForUserContext(
-    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

chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.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 CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_REAUTH_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_REAUTH_H_
-
-#include <memory>
-
-#include "base/callback_forward.h"
-#include "base/macros.h"
-
-namespace chromeos {
-
-class UserContext;
-
-// Responsible for locking the screen and reauthenticating the user so we can
-// create new cryptohome keys for passwordless sign-in.
-class EasyUnlockReauth {
- public:
-  typedef base::Callback<void(const UserContext&)> UserContextCallback;
-
-  // Launches the reauth screen to get the user context. If the screen fails
-  // for some reason, then this function will return false.
-  static bool ReauthForUserContext(UserContextCallback callback);
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(EasyUnlockReauth);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_REAUTH_H_

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

@@ -27,7 +27,6 @@
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_notification_controller.h"
-#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/gcm/gcm_profile_service_factory.h"