Index: chrome/browser/sxs_linux.cc |
=================================================================== |
--- chrome/browser/sxs_linux.cc (revision 272375) |
+++ chrome/browser/sxs_linux.cc (working copy) |
@@ -89,7 +89,7 @@ |
namespace sxs_linux { |
void AddChannelMarkToUserDataDir() { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); |
+ DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
base::FilePath user_data_dir; |
if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { |
LOG(ERROR) << "Failed to get user data dir path. The profile will not be " |
@@ -105,7 +105,7 @@ |
} |
bool ShouldMigrateUserDataDir() { |
- return CommandLine::ForCurrentProcess()->HasSwitch( |
+ return base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kMigrateDataDirForSxS); |
} |
@@ -142,7 +142,7 @@ |
} |
base::FilePath target_path = |
- CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
+ base::CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
switches::kMigrateDataDirForSxS); |
if (!base::Move(source_path, target_path)) { |