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

Unified Diff: components/rlz/rlz_tracker_unittest.cc

Issue 1417353006: Tests: Simplify SequencedWorkerPoolOwner, call Shutdown on destructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adjust formatting and rebase Created 5 years 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
Index: components/rlz/rlz_tracker_unittest.cc
diff --git a/components/rlz/rlz_tracker_unittest.cc b/components/rlz/rlz_tracker_unittest.cc
index eb33d891b612ffaefd8741d981f8ecde2455d4cc..ba505eef4126f275ebdd1dcc20d0e173fd2123cd 100644
--- a/components/rlz/rlz_tracker_unittest.cc
+++ b/components/rlz/rlz_tracker_unittest.cc
@@ -8,8 +8,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/test/sequenced_worker_pool_owner.h"
#include "base/thread_task_runner_handle.h"
-#include "base/threading/sequenced_worker_pool.h"
#include "base/time/time.h"
#include "components/rlz/rlz_tracker_delegate.h"
#include "net/url_request/url_request_test_util.h"
@@ -30,12 +30,10 @@ namespace {
class TestRLZTrackerDelegate : public RLZTrackerDelegate {
public:
TestRLZTrackerDelegate()
- : worker_pool_(new base::SequencedWorkerPool(1, "TestRLZTracker")),
+ : worker_pool_owner_(1, "TestRLZTracker"),
request_context_getter_(new net::TestURLRequestContextGetter(
base::ThreadTaskRunnerHandle::Get())) {}
- ~TestRLZTrackerDelegate() override { worker_pool_->Shutdown(); }
-
void set_brand(const char* brand) { brand_override_ = brand; }
void set_reactivation_brand(const char* reactivation_brand) {
@@ -68,7 +66,7 @@ class TestRLZTrackerDelegate : public RLZTrackerDelegate {
bool IsOnUIThread() override { return true; }
base::SequencedWorkerPool* GetBlockingPool() override {
- return worker_pool_.get();
+ return worker_pool_owner_.pool().get();
}
net::URLRequestContextGetter* GetRequestContext() override {
@@ -108,7 +106,7 @@ class TestRLZTrackerDelegate : public RLZTrackerDelegate {
}
private:
- scoped_refptr<base::SequencedWorkerPool> worker_pool_;
+ base::SequencedWorkerPoolOwner worker_pool_owner_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
std::string brand_override_;
« no previous file with comments | « components/component_updater/component_updater_service_unittest.cc ('k') | components/update_client/update_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698