Index: chrome/browser/chromeos/extensions/wallpaper_api.cc |
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc |
index 21025b55a852b387b83ddf252af0cf77d5119322..3d595d96e130765a4fd3e8c336fafb69f5b4514d 100644 |
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc |
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc |
@@ -10,6 +10,7 @@ |
#include "base/files/file_util.h" |
#include "base/lazy_instance.h" |
+#include "base/logging.h" |
bshe
2016/09/14 13:33:07
nit: doesn't look like this header is needed?
fdoray
2016/09/14 14:04:03
yes, needed at line 65
|
#include "base/memory/ref_counted_memory.h" |
#include "base/strings/stringprintf.h" |
#include "base/threading/worker_pool.h" |
@@ -153,11 +154,11 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded( |
wallpaper::kThumbnailWallpaperSubDir, wallpaper_files_id_, |
params_->details.filename); |
- sequence_token_ = BrowserThread::GetBlockingPool()->GetNamedSequenceToken( |
- wallpaper::kWallpaperSequenceTokenName); |
scoped_refptr<base::SequencedTaskRunner> task_runner = |
- BrowserThread::GetBlockingPool()-> |
- GetSequencedTaskRunnerWithShutdownBehavior(sequence_token_, |
+ BrowserThread::GetBlockingPool() |
+ ->GetSequencedTaskRunnerWithShutdownBehavior( |
+ BrowserThread::GetBlockingPool()->GetNamedSequenceToken( |
+ wallpaper::kWallpaperSequenceTokenName), |
base::SequencedWorkerPool::BLOCK_SHUTDOWN); |
wallpaper::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum( |
extensions::api::wallpaper::ToString(params_->details.layout)); |
@@ -203,8 +204,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded( |
void WallpaperSetWallpaperFunction::GenerateThumbnail( |
const base::FilePath& thumbnail_path, |
std::unique_ptr<gfx::ImageSkia> image) { |
- DCHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread( |
- sequence_token_)); |
+ wallpaper::AssertCalledOnWallpaperSequence(); |
if (!base::PathExists(thumbnail_path.DirName())) |
base::CreateDirectory(thumbnail_path.DirName()); |