favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/chromeos/

chrome/browser/chromeos/drive/file_system_util.cc

 // Copyright (c) 2012 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/chromeos/drive/file_system_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 115 matching lines @@
             ? chromeos::ProfileHelper::Get()->GetUserByProfile(
                   profile->GetOriginalProfile())
             : NULL;
     if (user)
       id = user->username_hash();
   }
   return GetDriveMountPointPathForUserIdHash(id);
 }
 
 FileSystemInterface* GetFileSystemByProfile(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   DriveIntegrationService* integration_service =
       GetIntegrationServiceByProfile(profile);
   return integration_service ? integration_service->file_system() : NULL;
 }
 
 FileSystemInterface* GetFileSystemByProfileId(void* profile_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // |profile_id| needs to be checked with ProfileManager::IsValidProfile
   // before using it.
   Profile* profile = reinterpret_cast<Profile*>(profile_id);
   if (!g_browser_process->profile_manager()->IsValidProfile(profile))
     return NULL;
   return GetFileSystemByProfile(profile);
 }
 
 DriveAppRegistry* GetDriveAppRegistryByProfile(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   DriveIntegrationService* integration_service =
       GetIntegrationServiceByProfile(profile);
   return integration_service ?
       integration_service->drive_app_registry() :
       NULL;
 }
 
 DriveServiceInterface* GetDriveServiceByProfile(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   DriveIntegrationService* integration_service =
       GetIntegrationServiceByProfile(profile);
   return integration_service ? integration_service->drive_service() : NULL;
 }
 
 bool IsUnderDriveMountPoint(const base::FilePath& path) {
   return !ExtractDrivePath(path).empty();
 }
 
 base::FilePath ExtractDrivePath(const base::FilePath& path) {
   std::vector<base::FilePath::StringType> components;
   path.GetComponents(&components);
   if (components.size() < 3)
     return base::FilePath();
   if (components[0] != FILE_PATH_LITERAL("/"))
     return base::FilePath();
   if (components[1] != FILE_PATH_LITERAL("special"))
     return base::FilePath();
   if (!StartsWithASCII(components[2], "drive", true))
     return base::FilePath();
 
   base::FilePath drive_path = GetDriveGrandRootPath();
   for (size_t i = 3; i < components.size(); ++i)
     drive_path = drive_path.Append(components[i]);
   return drive_path;
 }
 
 Profile* ExtractProfileFromPath(const base::FilePath& path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const std::vector<Profile*>& profiles =
       g_browser_process->profile_manager()->GetLoadedProfiles();
   for (size_t i = 0; i < profiles.size(); ++i) {
     Profile* original_profile = profiles[i]->GetOriginalProfile();
     if (original_profile == profiles[i] &&
         !chromeos::ProfileHelper::IsSigninProfile(original_profile)) {
       const base::FilePath base = GetDriveMountPointPath(original_profile);
       if (base == path || base.IsParent(path))
         return original_profile;
@@ skipping 55 matching lines @@
     output = input;
   base::ReplaceChars(output, "/", "_", &output);
   if (!output.empty() && output.find_first_not_of('.', 0) == std::string::npos)
     output = "_";
   return output;
 }
 
 void PrepareWritableFileAndRun(Profile* profile,
                                const base::FilePath& path,
                                const PrepareWritableFileCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   FileSystemInterface* file_system = GetFileSystemByProfile(profile);
   if (!file_system || !IsUnderDriveMountPoint(path)) {
     content::BrowserThread::GetBlockingPool()->PostTask(
         FROM_HERE, base::Bind(callback, FILE_ERROR_FAILED, base::FilePath()));
     return;
   }
 
   WriteOnCacheFile(file_system,
                    ExtractDrivePath(path),
                    std::string(),  // mime_type
                    callback);
 }
 
 void EnsureDirectoryExists(Profile* profile,
                            const base::FilePath& directory,
                            const FileOperationCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
   if (IsUnderDriveMountPoint(directory)) {
     FileSystemInterface* file_system = GetFileSystemByProfile(profile);
     DCHECK(file_system);
     file_system->CreateDirectory(
         ExtractDrivePath(directory),
         true /* is_exclusive */,
         true /* is_recursive */,
         callback);
   } else {
@@ skipping 17 matching lines @@
 
 GURL ReadUrlFromGDocFile(const base::FilePath& file_path) {
   return GURL(ReadStringFromGDocFile(file_path, "url"));
 }
 
 std::string ReadResourceIdFromGDocFile(const base::FilePath& file_path) {
   return ReadStringFromGDocFile(file_path, "resource_id");
 }
 
 bool IsDriveEnabledForProfile(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!chromeos::IsProfileAssociatedWithGaiaAccount(profile))
     return false;
 
   // Disable Drive if preference is set. This can happen with commandline flag
   // --disable-drive or enterprise policy, or with user settings.
   if (profile->GetPrefs()->GetBoolean(prefs::kDisableDrive))
     return false;
 
   return true;
@@ skipping 16 matching lines @@
   const bool disable_sync_over_celluar =
       profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular);
 
   if (is_connection_cellular && disable_sync_over_celluar)
     return DRIVE_CONNECTED_METERED;
   return DRIVE_CONNECTED;
 }
 
 }  // namespace util
 }  // namespace drive