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

chrome/browser/extensions/app_data_migrator.cc

 // Copyright 2015 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/extensions/app_data_migrator.h"
 
 #include "base/files/file_util.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 62 matching lines @@
       extensions::Extension::GetBaseURLFromExtensionId(extension->id());
 
   old_indexed_db_context->CopyOriginData(extension_url, indexed_db_context);
 }
 
 void MigrateFileSystem(WeakPtr<extensions::AppDataMigrator> migrator,
                        StoragePartition* old_partition,
                        StoragePartition* current_partition,
                        const extensions::Extension* extension,
                        const base::Closure& reply) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Since this method is static and it's being run as a closure task, check to
   // make sure the calling object is still around.
   if (!migrator.get()) {
     return;
   }
 
   FileSystemContext* old_fs_context = old_partition->GetFileSystemContext();
   FileSystemContext* fs_context = current_partition->GetFileSystemContext();
 
   // Perform the file system migration on the old file system's
   // sequenced task runner. This is to ensure it queues after any
   // in-flight file system operations. After it completes, it should
   // invoke the original callback passed into DoMigrationAndReply.
   old_fs_context->default_file_task_runner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&MigrateOnFileSystemThread, make_scoped_refptr(old_fs_context),
                  make_scoped_refptr(fs_context), make_scoped_refptr(extension)),
       reply);
 }
 
 void MigrateLegacyPartition(WeakPtr<extensions::AppDataMigrator> migrator,
                             StoragePartition* old_partition,
                             StoragePartition* current_partition,
                             const extensions::Extension* extension,
                             const base::Closure& reply) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   IndexedDBContext* indexed_db_context =
       current_partition->GetIndexedDBContext();
   IndexedDBContext* old_indexed_db_context =
       old_partition->GetIndexedDBContext();
 
   // Create a closure for the file system migration. This is the next step in
   // the migration flow after the IndexedDB migration.
   base::Closure migrate_fs =
       base::Bind(&MigrateFileSystem, migrator, old_partition, current_partition,
@@ skipping 21 matching lines @@
 }
 
 bool AppDataMigrator::NeedsMigration(const Extension* old,
                                      const Extension* extension) {
   return old && old->is_legacy_packaged_app() && extension->is_platform_app();
 }
 
 void AppDataMigrator::DoMigrationAndReply(const Extension* old,
                                           const Extension* extension,
                                           const base::Closure& reply) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(NeedsMigration(old, extension));
 
   // This should retrieve the general storage partition.
   content::StoragePartition* old_partition =
       BrowserContext::GetStoragePartitionForSite(
           profile_, Extension::GetBaseURLFromExtensionId(extension->id()));
 
   // Enable the new extension so we can access its storage partition.
   bool old_was_disabled = registry_->AddEnabled(extension);
 
   // This should create a new isolated partition for the new version of the
   // extension.
   StoragePartition* new_partition = BrowserContext::GetStoragePartitionForSite(
       profile_, Extension::GetBaseURLFromExtensionId(extension->id()));
 
   // Now, restore the enabled/disabled state of the new and old extensions.
   if (old_was_disabled)
     registry_->RemoveEnabled(extension->id());
   else
     registry_->AddEnabled(old);
 
   MigrateLegacyPartition(weak_factory_.GetWeakPtr(), old_partition,
                          new_partition, extension, reply);
 }
 
 }  // namespace extensions