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

Unified Diff: ui/views/mus/views_mus_test_suite.cc

Issue 1980283002: Revert of mus: Add views_mus_interactive_ui_tests target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « ui/views/mus/views_mus_test_suite.h ('k') | ui/views/run_all_unittests.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/views_mus_test_suite.cc
diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
deleted file mode 100644
index 9d327311ce9b698e7a7eaa61b0fe1612b75254d9..0000000000000000000000000000000000000000
--- a/ui/views/mus/views_mus_test_suite.cc
+++ /dev/null
@@ -1,142 +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 "ui/views/mus/views_mus_test_suite.h"
-
-#include <memory>
-
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/run_loop.h"
-#include "base/synchronization/waitable_event.h"
-#include "base/threading/simple_thread.h"
-#include "base/threading/thread.h"
-#include "services/shell/background/background_shell.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/shell_client.h"
-#include "services/shell/public/cpp/shell_connection.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/views/mus/window_manager_connection.h"
-#include "ui/views/test/platform_test_helper.h"
-#include "ui/views/views_delegate.h"
-
-namespace views {
-namespace {
-
-class DefaultShellClient : public shell::ShellClient {
- public:
- DefaultShellClient() {}
- ~DefaultShellClient() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
-};
-
-class PlatformTestHelperMus : public PlatformTestHelper {
- public:
- PlatformTestHelperMus() {}
- ~PlatformTestHelperMus() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
-};
-
-std::unique_ptr<PlatformTestHelper> CreatePlatformTestHelper(
- shell::Connector* connector,
- const shell::Identity& identity) {
- if (!WindowManagerConnection::Exists())
- WindowManagerConnection::Create(connector, identity);
- return base::WrapUnique(new PlatformTestHelperMus);
-}
-
-} // namespace
-
-class ShellConnection {
- public:
- ShellConnection() : thread_("Persistent shell connections") {
- base::WaitableEvent wait(false, false);
- base::Thread::Options options;
- thread_.StartWithOptions(options);
- thread_.task_runner()->PostTask(
- FROM_HERE, base::Bind(&ShellConnection::SetUpConnections,
- base::Unretained(this), &wait));
- wait.Wait();
-
- // WindowManagerConnection cannot be created from here yet, although the
- // connector and identity are available at this point. This is because
- // WindowManagerConnection needs a ViewsDelegate and a MessageLoop to have
- // been installed first. So delay the creation until the necessary
- // dependencies have been met.
- PlatformTestHelper::set_factory(base::Bind(
- &CreatePlatformTestHelper, shell_connector_.get(), shell_identity_));
- }
-
- ~ShellConnection() {
- views::WindowManagerConnection::Reset();
- base::WaitableEvent wait(false, false);
- thread_.task_runner()->PostTask(
- FROM_HERE, base::Bind(&ShellConnection::TearDownConnections,
- base::Unretained(this), &wait));
- wait.Wait();
- }
-
- private:
- void SetUpConnections(base::WaitableEvent* wait) {
- background_shell_.reset(new shell::BackgroundShell);
- background_shell_->Init(nullptr);
- shell_client_.reset(new DefaultShellClient);
- shell_connection_.reset(new shell::ShellConnection(
- shell_client_.get(),
- background_shell_->CreateShellClientRequest(GetTestName())));
-
- // ui/views/mus requires a WindowManager running, for now use the desktop
- // one.
- shell::Connector* connector = shell_connection_->connector();
- connector->Connect("mojo:desktop_wm");
- shell_connector_ = connector->Clone();
- shell_identity_ = shell_connection_->identity();
- wait->Signal();
- }
-
- void TearDownConnections(base::WaitableEvent* wait) {
- shell_connection_.reset();
- wait->Signal();
- }
-
- // Returns the name of the test executable, e.g. "exe:views_mus_unittests".
- std::string GetTestName() {
- base::FilePath executable = base::CommandLine::ForCurrentProcess()
- ->GetProgram()
- .BaseName()
- .RemoveExtension();
- return std::string("exe:") + executable.MaybeAsASCII();
- }
-
- base::Thread thread_;
- std::unique_ptr<shell::BackgroundShell> background_shell_;
- std::unique_ptr<shell::ShellConnection> shell_connection_;
- std::unique_ptr<DefaultShellClient> shell_client_;
- std::unique_ptr<shell::Connector> shell_connector_;
- shell::Identity shell_identity_;
-
- DISALLOW_COPY_AND_ASSIGN(ShellConnection);
-};
-
-ViewsMusTestSuite::ViewsMusTestSuite(int argc, char** argv)
- : ViewTestSuite(argc, argv) {}
-
-ViewsMusTestSuite::~ViewsMusTestSuite() {}
-
-void ViewsMusTestSuite::Initialize() {
- PlatformTestHelper::SetIsMus();
- ViewTestSuite::Initialize();
- shell_connections_.reset(new ShellConnection);
-}
-
-void ViewsMusTestSuite::Shutdown() {
- shell_connections_.reset();
- ViewTestSuite::Shutdown();
-}
-
-} // namespace views
« no previous file with comments | « ui/views/mus/views_mus_test_suite.h ('k') | ui/views/run_all_unittests.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698