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

Unified Diff: chrome/browser/profiles/profile_manager.h

Issue 2907253003: Replace deprecated base::NonThreadSafe in chrome/browser/profiles. (Closed)
Patch Set: Android crashes?? Revert improvement to chrome_network_delegate_unittest.cc... 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
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);
};
« no previous file with comments | « chrome/browser/profiles/profile_attributes_storage_unittest.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698