Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4918)

Unified Diff: chrome/browser/chromeos/net/network_portal_detector_impl.h

Issue 2909203002: Replace deprecated base::NonThreadSafe in chrome/browser/chromeos in favor of SequenceChecker. (Closed)
Patch Set: fix member order Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/net/network_portal_detector_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/net/network_portal_detector_impl.h
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h
index a4aa5b12589717a9802fb0d162c9c4381a48af32..042f6bd87f2df3bdeea695e0dd67592fed03ff22 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.h
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h
@@ -15,7 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
#include "base/time/time.h"
#include "chromeos/network/network_state_handler_observer.h"
#include "chromeos/network/portal_detector/network_portal_detector.h"
@@ -42,7 +42,6 @@ class NetworkState;
// NetworkStateHandler and delegates portal detection for the default
// network to CaptivePortalService.
class NetworkPortalDetectorImpl : public NetworkPortalDetector,
- public base::NonThreadSafe,
public chromeos::NetworkStateHandlerObserver,
public content::NotificationObserver,
public PortalDetectorStrategy::Delegate {
@@ -259,6 +258,11 @@ class NetworkPortalDetectorImpl : public NetworkPortalDetector,
// Number of detection attempts in a row with NO RESPONSE result.
int no_response_result_count_ = 0;
+ // Must be declared before |notification_controller_| as
+ // ~NetworkPortalNotificationController() calls
+ // NetworkPortalDetectorImpl::RemoveObserver() which uses this.
+ SEQUENCE_CHECKER(sequence_checker_);
+
// UI notification controller about captive portal state.
std::unique_ptr<NetworkPortalNotificationController> notification_controller_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/net/network_portal_detector_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698