[Nearby] Invalidate surfaces on screen lock changes.

Invalidate send and receive surfaces to make sure we start or stop
advertising based on changes to screen lock state.

Bug: b:166174379
Bug: 1119993
Change-Id: Ie7490d888b42e4c4aac783216b54490476f53aa5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392703
Commit-Queue: Michael Hansen <hansenmichael@google.com>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806767}

chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "ash/public/cpp/session/session_controller.h"
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/files/file.h"
@@ -43,7 +44,6 @@
 #include "crypto/random.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
-#include "ui/base/idle/idle.h"
 #include "url/gurl.h"
 
 namespace {
@@ -230,6 +230,14 @@ NearbySharingServiceImpl::NearbySharingServiceImpl(
   DCHECK(profile_);
   DCHECK(nearby_connections_manager_);
 
+#if defined(OS_CHROMEOS)
+  auto* session_controller = ash::SessionController::Get();
+  if (session_controller) {
+    is_screen_locked_ = session_controller->IsScreenLocked();
+    session_controller->AddObserver(this);
+  }
+#endif  // OS_CHROMEOS
+
   nearby_process_observer_.Add(process_manager_);
 
   settings_.AddSettingsObserver(settings_receiver_.BindNewPipeAndPassRemote());
@@ -282,6 +290,12 @@ void NearbySharingServiceImpl::Shutdown() {
   if (bluetooth_adapter_)
     bluetooth_adapter_->RemoveObserver(this);
 
+#if defined(OS_CHROMEOS)
+  auto* session_controller = ash::SessionController::Get();
+  if (session_controller)
+    session_controller->RemoveObserver(this);
+#endif  // OS_CHROMEOS
+
   foreground_receive_callbacks_.Clear();
   background_receive_callbacks_.Clear();
   foreground_send_transfer_callbacks_.Clear();
@@ -820,6 +834,13 @@ void NearbySharingServiceImpl::OnEndpointLost(const std::string& endpoint_id) {
   NS_LOG(VERBOSE) << __func__ << ": Reported onShareTargetLost";
 }
 
+void NearbySharingServiceImpl::OnLockStateChanged(bool locked) {
+  NS_LOG(VERBOSE) << __func__ << ": Screen lock state changed. (" << locked
+                  << ")";
+  is_screen_locked_ = locked;
+  InvalidateSurfaceState();
+}
+
 void NearbySharingServiceImpl::OnEnabledChanged(bool enabled) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (enabled) {
@@ -1120,7 +1141,7 @@ void NearbySharingServiceImpl::InvalidateAdvertisingState() {
   }
 
   // Screen is off. Do no work.
-  if (ui::CheckIdleStateIsLocked()) {
+  if (is_screen_locked_) {
     StopAdvertising();
     NS_LOG(VERBOSE) << __func__
                     << ": Stopping advertising because the screen is locked.";
@@ -1289,7 +1310,7 @@ void NearbySharingServiceImpl::InvalidateScanningState() {
   }
 
   // Screen is off. Do no work.
-  if (ui::CheckIdleStateIsLocked()) {
+  if (is_screen_locked_) {
     StopScanning();
     NS_LOG(VERBOSE) << __func__
                     << ": Stopping discovery because the screen is locked.";
@@ -1346,7 +1367,7 @@ void NearbySharingServiceImpl::StartScanning() {
     return;
   }
 
-  if (ui::CheckIdleStateIsLocked()) {
+  if (is_screen_locked_) {
     NS_LOG(VERBOSE) << __func__
                     << ": Failed to scan because the user's screen is locked.";
     return;

chrome/browser/nearby_sharing/nearby_sharing_service_impl.h

@@ -11,6 +11,7 @@
 #include <utility>
 #include <vector>
 
+#include "ash/public/cpp/session/session_observer.h"
 #include "base/cancelable_callback.h"
 #include "base/containers/flat_map.h"
 #include "base/memory/ptr_util.h"
@@ -57,7 +58,8 @@ class NearbySharingServiceImpl
       public NearbyProcessManager::Observer,
       public device::BluetoothAdapter::Observer,
       public NearbyConnectionsManager::IncomingConnectionListener,
-      public NearbyConnectionsManager::DiscoveryListener {
+      public NearbyConnectionsManager::DiscoveryListener,
+      public ash::SessionObserver {
  public:
   explicit NearbySharingServiceImpl(
       PrefService* prefs,
@@ -132,6 +134,9 @@ class NearbySharingServiceImpl
   void OnEndpointLost(const std::string& endpoint_id) override;
 
  private:
+  // ash::SessionObserver:
+  void OnLockStateChanged(bool locked) override;
+
   base::ObserverList<TransferUpdateCallback>& GetReceiveCallbacksFromState(
       ReceiveSurfaceState state);
   bool IsVisibleInBackground(Visibility visibility);
@@ -316,6 +321,7 @@ class NearbySharingServiceImpl
   std::unique_ptr<NearbyShareCertificateManager> certificate_manager_;
   NearbyShareSettings settings_;
   NearbyFileHandler file_handler_;
+  bool is_screen_locked_ = false;
 
   // A list of service observers.
   base::ObserverList<NearbySharingService::Observer> observers_;

chrome/browser/ui/ash/test_session_controller.cc

@@ -6,9 +6,17 @@
 
 #include <utility>
 
+#include "ash/public/cpp/session/session_observer.h"
+
 TestSessionController::TestSessionController() = default;
 TestSessionController::~TestSessionController() = default;
 
+void TestSessionController::SetScreenLocked(bool locked) {
+  is_screen_locked_ = locked;
+  for (auto& observer : observers_)
+    observer.OnLockStateChanged(locked);
+}
+
 void TestSessionController::SetClient(ash::SessionControllerClient* client) {}
 
 void TestSessionController::SetSessionInfo(const ash::SessionInfo& info) {
@@ -77,11 +85,14 @@ void TestSessionController::RemoveSessionActivationObserverForAccountId(
     const AccountId& account_id,
     ash::SessionActivationObserver* observer) {}
 
-void TestSessionController::AddObserver(ash::SessionObserver* observer) {}
+void TestSessionController::AddObserver(ash::SessionObserver* observer) {
+  observers_.AddObserver(observer);
+}
 
-void TestSessionController::RemoveObserver(ash::SessionObserver* observer) {}
+void TestSessionController::RemoveObserver(ash::SessionObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
 
 bool TestSessionController::IsScreenLocked() const {
-  NOTIMPLEMENTED();
-  return false;
+  return is_screen_locked_;
 }

chrome/browser/ui/ash/test_session_controller.h

@@ -10,6 +10,7 @@
 
 #include "ash/public/cpp/session/session_controller.h"
 #include "base/macros.h"
+#include "base/observer_list.h"
 #include "base/optional.h"
 
 // Test implementation of ash's SessionController interface.
@@ -44,6 +45,8 @@ class TestSessionController : public ash::SessionController {
     return set_user_session_order_count_;
   }
 
+  void SetScreenLocked(bool locked);
+
   // ash::SessionController:
   void SetClient(ash::SessionControllerClient* client) override;
   void SetSessionInfo(const ash::SessionInfo& info) override;
@@ -82,6 +85,8 @@ class TestSessionController : public ash::SessionController {
   int update_user_session_count_ = 0;
   int lock_animation_complete_call_count_ = 0;
   int set_user_session_order_count_ = 0;
+  bool is_screen_locked_ = false;
+  base::ObserverList<ash::SessionObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSessionController);
 };