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

Unified Diff: ash/test/ash_test_environment_default.cc

Issue 2303453003: Revert of Moves ash content specific tests into ash_content_unittests (Closed)
Patch Set: Created 4 years, 4 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 | « ash/test/ash_test_environment_content.cc ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_environment_default.cc
diff --git a/ash/test/ash_test_environment_default.cc b/ash/test/ash_test_environment_default.cc
deleted file mode 100644
index f74443b20c55fd83752997dc03c8a07129b2f0ee..0000000000000000000000000000000000000000
--- a/ash/test/ash_test_environment_default.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2016 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 "ash/test/ash_test_environment.h"
-
-#include "ash/test/ash_test_views_delegate.h"
-#include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
-#include "base/threading/sequenced_worker_pool.h"
-
-namespace ash {
-namespace test {
-namespace {
-
-class AshTestEnvironmentDefault : public AshTestEnvironment {
- public:
- AshTestEnvironmentDefault() {}
-
- ~AshTestEnvironmentDefault() override {
- base::RunLoop().RunUntilIdle();
- if (blocking_pool_) {
- blocking_pool_->FlushForTesting();
- blocking_pool_->Shutdown();
- blocking_pool_ = nullptr;
- }
- base::RunLoop().RunUntilIdle();
- }
-
- // AshTestEnvironment:
- base::SequencedWorkerPool* GetBlockingPool() override {
- if (!blocking_pool_) {
- const size_t kMaxNumberThreads = 3u; // Matches that of content.
- blocking_pool_ = new base::SequencedWorkerPool(
- kMaxNumberThreads, "AshBlocking", base::TaskPriority::USER_VISIBLE);
- }
- return blocking_pool_.get();
- }
- std::unique_ptr<views::ViewsDelegate> CreateViewsDelegate() override {
- return base::MakeUnique<AshTestViewsDelegate>();
- }
-
- private:
- base::MessageLoopForUI message_loop_;
- scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
-
- DISALLOW_COPY_AND_ASSIGN(AshTestEnvironmentDefault);
-};
-
-} // namespace
-
-// static
-std::unique_ptr<AshTestEnvironment> AshTestEnvironment::Create() {
- return base::MakeUnique<AshTestEnvironmentDefault>();
-}
-
-} // namespace test
-} // namespace ash
« no previous file with comments | « ash/test/ash_test_environment_content.cc ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698