favor DCHECK_CURRENTLY_ON for better logs in content/browser/[q-z]*

content/browser/time_zone_monitor_linux.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/time_zone_monitor.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 33 matching lines @@
 // FilePathWatcher needs to run on the FILE thread, but TimeZoneMonitor runs
 // on the UI thread. TimeZoneMonitorLinuxImpl is the bridge between these
 // threads.
 class TimeZoneMonitorLinuxImpl
     : public base::RefCountedThreadSafe<TimeZoneMonitorLinuxImpl> {
  public:
   explicit TimeZoneMonitorLinuxImpl(TimeZoneMonitorLinux* owner)
       : base::RefCountedThreadSafe<TimeZoneMonitorLinuxImpl>(),
         file_path_watchers_(),
         owner_(owner) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&TimeZoneMonitorLinuxImpl::StartWatchingOnFileThread, this));
   }
 
   void StopWatching() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     owner_ = NULL;
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&TimeZoneMonitorLinuxImpl::StopWatchingOnFileThread, this));
   }
 
  private:
   friend class base::RefCountedThreadSafe<TimeZoneMonitorLinuxImpl>;
 
   ~TimeZoneMonitorLinuxImpl() {
     DCHECK(!owner_);
     STLDeleteElements(&file_path_watchers_);
   }
 
   void StartWatchingOnFileThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
     // There is no true standard for where time zone information is actually
     // stored. glibc uses /etc/localtime, uClibc uses /etc/TZ, and some older
     // systems store the name of the time zone file within /usr/share/zoneinfo
     // in /etc/timezone. Different libraries and custom builds may mean that
     // still more paths are used. Just watch all three of these paths, because
     // false positives are harmless, assuming the false positive rate is
     // reasonable.
     const char* kFilesToWatch[] = {
       "/etc/localtime",
       "/etc/timezone",
       "/etc/TZ",
     };
 
     for (size_t index = 0; index < arraysize(kFilesToWatch); ++index) {
       file_path_watchers_.push_back(new base::FilePathWatcher());
       file_path_watchers_.back()->Watch(
           base::FilePath(kFilesToWatch[index]),
           false,
           base::Bind(&TimeZoneMonitorLinuxImpl::OnTimeZoneFileChanged, this));
     }
   }
 
   void StopWatchingOnFileThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     STLDeleteElements(&file_path_watchers_);
   }
 
   void OnTimeZoneFileChanged(const base::FilePath& path, bool error) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&TimeZoneMonitorLinuxImpl::OnTimeZoneFileChangedOnUIThread,
                    this));
   }
 
   void OnTimeZoneFileChangedOnUIThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (owner_) {
       owner_->NotifyRenderersFromImpl();
     }
   }
 
   std::vector<base::FilePathWatcher*> file_path_watchers_;
   TimeZoneMonitorLinux* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(TimeZoneMonitorLinuxImpl);
 };
@@ skipping 28 matching lines @@
 }
 
 // static
 scoped_ptr<TimeZoneMonitor> TimeZoneMonitor::Create() {
   return scoped_ptr<TimeZoneMonitor>(new TimeZoneMonitorLinux());
 }
 
 }  // namespace content
 
 #endif  // !OS_CHROMEOS