Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: components/wallpaper/wallpaper_resizer_unittest.cc

Issue 2338363002: Replace single-threaded SequencedWorkerPool with base::Thread in WallpaperResizerTest. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/wallpaper/wallpaper_resizer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/wallpaper/wallpaper_resizer_unittest.cc
diff --git a/components/wallpaper/wallpaper_resizer_unittest.cc b/components/wallpaper/wallpaper_resizer_unittest.cc
index 7d4fefb6bf40cfce932e7dce2bf9d7f35c8fa5b8..fadf11c3cb7fd3407d52eea13251a19910522381 100644
--- a/components/wallpaper/wallpaper_resizer_unittest.cc
+++ b/components/wallpaper/wallpaper_resizer_unittest.cc
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
-#include "base/test/sequenced_worker_pool_owner.h"
+#include "base/threading/thread.h"
#include "components/wallpaper/wallpaper_resizer_observer.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/image/image_skia_rep.h"
@@ -62,15 +62,19 @@ namespace wallpaper {
class WallpaperResizerTest : public testing::Test,
public WallpaperResizerObserver {
public:
- WallpaperResizerTest() : worker_pool_owner_(1, "WallpaperResizerTest") {}
+ WallpaperResizerTest() : worker_thread_("WallpaperResizerTest") {}
~WallpaperResizerTest() override {}
+ void SetUp() override {
+ ASSERT_TRUE(worker_thread_.Start());
+ }
+
gfx::ImageSkia Resize(const gfx::ImageSkia& image,
const gfx::Size& target_size,
WallpaperLayout layout) {
std::unique_ptr<WallpaperResizer> resizer;
resizer.reset(
- new WallpaperResizer(image, target_size, layout, worker_pool()));
+ new WallpaperResizer(image, target_size, layout, task_runner()));
resizer->AddObserver(this);
resizer->StartResize();
WaitForResize();
@@ -78,8 +82,8 @@ class WallpaperResizerTest : public testing::Test,
return resizer->image();
}
- base::SequencedWorkerPool* worker_pool() {
- return worker_pool_owner_.pool().get();
+ scoped_refptr<base::TaskRunner> task_runner() {
+ return worker_thread_.task_runner();
}
void WaitForResize() { base::RunLoop().Run(); }
@@ -88,7 +92,7 @@ class WallpaperResizerTest : public testing::Test,
private:
base::MessageLoop message_loop_;
- base::SequencedWorkerPoolOwner worker_pool_owner_;
+ base::Thread worker_thread_;
DISALLOW_COPY_AND_ASSIGN(WallpaperResizerTest);
};
@@ -149,7 +153,7 @@ TEST_F(WallpaperResizerTest, ImageId) {
// Create a WallpaperResizer and check that it reports an original image ID
// both pre- and post-resize that matches the ID returned by GetImageId().
WallpaperResizer resizer(image, gfx::Size(10, 20), WALLPAPER_LAYOUT_STRETCH,
- worker_pool());
+ task_runner());
EXPECT_EQ(WallpaperResizer::GetImageId(image), resizer.original_image_id());
resizer.AddObserver(this);
resizer.StartResize();
« no previous file with comments | « components/wallpaper/wallpaper_resizer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698