Index: chrome/browser/profiles/profile_manager.h |
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h |
index 385f9c360fe2b718b6a9556d811bb8f0a4532b2e..083970a25c7ad95b8a4bcbecc58fa68022a00d06 100644 |
--- a/chrome/browser/profiles/profile_manager.h |
+++ b/chrome/browser/profiles/profile_manager.h |
@@ -19,7 +19,7 @@ |
#include "base/macros.h" |
#include "base/memory/linked_ptr.h" |
#include "base/message_loop/message_loop.h" |
-#include "base/threading/non_thread_safe.h" |
+#include "base/threading/thread_checker.h" |
#include "build/build_config.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_metrics.h" |
@@ -32,8 +32,7 @@ |
class ProfileAttributesStorage; |
class ProfileInfoCache; |
-class ProfileManager : public base::NonThreadSafe, |
- public content::NotificationObserver, |
+class ProfileManager : public content::NotificationObserver, |
public Profile::Delegate { |
public: |
typedef base::Callback<void(Profile*, Profile::CreateStatus)> CreateCallback; |
@@ -427,6 +426,13 @@ class ProfileManager : public base::NonThreadSafe, |
std::vector<Profile*> active_profiles_; |
bool closing_all_browsers_; |
+ // TODO(chrome/browser/profiles/OWNERS): Usage of this in profile_manager.cc |
+ // should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for |
+ // consistency with surrounding code in the same file but that wasn't trivial |
+ // enough to do as part of the mass refactor CL which introduced |
+ // |thread_checker_|, ref. https://codereview.chromium.org/2907253003/#msg37. |
+ THREAD_CHECKER(thread_checker_); |
+ |
DISALLOW_COPY_AND_ASSIGN(ProfileManager); |
}; |