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

Unified Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Issue 2919933002: Revert of ChromeOS: Per-user time zone: refactor tests first. (Closed)
Patch Set: 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/chromeos/login/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 07c7c7d6378174527e0785a52eb5cd634aef19ae..495331f77b2a7ea4ab99465d94ccab25fec5975a 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -194,9 +194,7 @@
}
ChromeUserManagerImpl::ChromeUserManagerImpl()
- : ChromeUserManager(base::ThreadTaskRunnerHandle::IsSet()
- ? base::ThreadTaskRunnerHandle::Get()
- : scoped_refptr<base::TaskRunner>()),
+ : ChromeUserManager(base::ThreadTaskRunnerHandle::Get()),
cros_settings_(CrosSettings::Get()),
device_local_account_policy_service_(NULL),
supervised_user_manager_(new SupervisedUserManagerImpl(this)),
@@ -205,10 +203,7 @@
UpdateNumberOfUsers();
// UserManager instance should be used only on UI thread.
- // (or in unit tests)
- if (base::ThreadTaskRunnerHandle::IsSet())
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
registrar_.Add(this,
chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
content::NotificationService::AllSources());

Powered by Google App Engine
This is Rietveld 408576698