[chrome/browser/renderer_host] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/renderer_host/pepper/device_id_fetcher.cc

 // Copyright (c) 2013 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 "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
 
 #include "base/files/file_util.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 38 matching lines @@
   // Not implemented for other platforms.
   NOTREACHED();
   callback.Run(std::string());
 #endif
 }
 
 }  // namespace
 
 DeviceIDFetcher::DeviceIDFetcher(int render_process_id)
     : in_progress_(false), render_process_id_(render_process_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
 
 DeviceIDFetcher::~DeviceIDFetcher() {}
 
 bool DeviceIDFetcher::Start(const IDCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (in_progress_)
     return false;
 
   in_progress_ = true;
   callback_ = callback;
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&DeviceIDFetcher::CheckPrefsOnUIThread, this));
   return true;
 }
 
 // static
 void DeviceIDFetcher::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kEnableDRM, true);
   prefs->RegisterStringPref(prefs::kDRMSalt, "");
 }
 
 // static
 base::FilePath DeviceIDFetcher::GetLegacyDeviceIDPath(
     const base::FilePath& profile_path) {
   return profile_path.AppendASCII(kDRMIdentifierFile);
 }
 
 void DeviceIDFetcher::CheckPrefsOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = NULL;
   RenderProcessHost* render_process_host =
       RenderProcessHost::FromID(render_process_id_);
   if (render_process_host && render_process_host->GetBrowserContext()) {
     profile =
         Profile::FromBrowserContext(render_process_host->GetBrowserContext());
   }
 
   if (!profile || profile->IsOffTheRecord() ||
@@ skipping 23 matching lines @@
                  salt));
 #else
   // Get the machine ID and call ComputeOnUIThread with salt + machine_id.
   GetMachineIDAsync(
       base::Bind(&DeviceIDFetcher::ComputeOnUIThread, this, salt));
 #endif
 }
 
 void DeviceIDFetcher::ComputeOnUIThread(const std::string& salt,
                                         const std::string& machine_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (machine_id.empty()) {
     LOG(ERROR) << "Empty machine id";
     RunCallbackOnIOThread(std::string(), PP_ERROR_FAILED);
     return;
   }
 
   // Build the identifier as follows:
   // SHA256(machine-id||service||SHA256(machine-id||service||salt))
   std::vector<uint8> salt_bytes;
@@ skipping 54 matching lines @@
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result));
     return;
   }
   in_progress_ = false;
   callback_.Run(id, result);
 }
 
 }  // namespace chrome