Index: chrome/browser/component_updater/pepper_flash_component_installer.cc |
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc |
index aa01a668574e725cc03ae29e943d820d0102694b..80d57154f913a6f1134c8cf652bf005ab63a860e 100644 |
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc |
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc |
@@ -73,7 +73,7 @@ base::FilePath GetPepperFlashBaseDirectory() { |
bool GetPepperFlashDirectory(base::FilePath* latest_dir, |
Version* latest_version, |
std::vector<base::FilePath>* older_dirs) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
base::FilePath base_dir = GetPepperFlashBaseDirectory(); |
bool found = false; |
base::FileEnumerator file_enumerator( |
@@ -147,7 +147,7 @@ bool IsPepperFlash(const content::WebPluginInfo& plugin) { |
void RegisterPepperFlashWithChrome(const base::FilePath& path, |
const Version& version) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
content::PepperPluginInfo plugin_info; |
if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info)) |
return; |
@@ -257,7 +257,7 @@ namespace { |
#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) |
void FinishPepperFlashUpdateRegistration(ComponentUpdateService* cus, |
const Version& version) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
update_client::CrxComponent pepflash; |
pepflash.name = "pepper_flash"; |
pepflash.installer = new PepperFlashComponentInstaller(version); |
@@ -269,7 +269,7 @@ void FinishPepperFlashUpdateRegistration(ComponentUpdateService* cus, |
} |
void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
base::FilePath path = GetPepperFlashBaseDirectory(); |
if (!base::PathExists(path)) { |
if (!base::CreateDirectory(path)) { |