Adds DesktopWindowTreeHostMus

ui/views/mus/views_aura_mus_test_suite.cc

 // 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 "ui/views/mus/views_aura_mus_test_suite.h"
 
 #include <memory>
 #include <string>
 
 #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/service_manager/background/background_service_manager.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/common/switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/mus/mus_client.h"
+#include "ui/views/mus/test_utils.h"
 #include "ui/views/test/platform_test_helper.h"
+#include "ui/views/test/views_test_helper_aura.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 namespace {
 
 void EnsureCommandLineSwitch(const std::string& name) {
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(name))
     cmd_line->AppendSwitch(name);
 }
 
 class DefaultService : public service_manager::Service {
  public:
   DefaultService() {}
   ~DefaultService() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultService);
 };
 
 class PlatformTestHelperMus : public PlatformTestHelper {
  public:
   PlatformTestHelperMus(service_manager::Connector* connector,
                         const service_manager::Identity& identity) {
-    // It is necessary to recreate the WindowManagerConnection for each test,
+    // It is necessary to recreate the MusClient for each test,
     // since a new MessageLoop is created for each test.
-    connection_ = WindowManagerConnection::Create(connector, identity);
+    mus_client_ = test::MusClientTestApi::Create(connector, identity);
   }
   ~PlatformTestHelperMus() override {}
 
+  // PlatformTestHelper:
+  void OnTestHelperCreated(ViewsTestHelper* helper) override {
+    static_cast<ViewsTestHelperAura*>(helper)->EnableMusWithWindowTreeClient(
+        mus_client_->window_tree_client());
+  }
+
  private:
-  std::unique_ptr<WindowManagerConnection> connection_;
+  std::unique_ptr<MusClient> mus_client_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
 };
 
 std::unique_ptr<PlatformTestHelper> CreatePlatformTestHelper(
     const service_manager::Identity& identity,
     const base::Callback<service_manager::Connector*(void)>& callback) {
   return base::MakeUnique<PlatformTestHelperMus>(callback.Run(), identity);
 }
 
@@ skipping 88 matching lines @@
   std::unique_ptr<service_manager::BackgroundServiceManager>
       background_service_manager_;
   std::unique_ptr<service_manager::ServiceContext> service_manager_connection_;
   std::unique_ptr<DefaultService> service_;
   std::unique_ptr<service_manager::Connector> service_manager_connector_;
   service_manager::Identity service_manager_identity_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection);
 };
 
-ViewsMusTestSuite::ViewsMusTestSuite(int argc, char** argv)
+ViewsAuraMusTestSuite::ViewsAuraMusTestSuite(int argc, char** argv)
     : ViewsTestSuite(argc, argv) {}
 
-ViewsMusTestSuite::~ViewsMusTestSuite() {}
+ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {}
 
-void ViewsMusTestSuite::Initialize() {
+void ViewsAuraMusTestSuite::Initialize() {
   PlatformTestHelper::SetIsMus();
   // Let other services know that we're running in tests. Do this with a
   // command line flag to avoid making blocking calls to other processes for
   // setup for tests (e.g. to unlock the screen in the window manager).
   EnsureCommandLineSwitch(ui::switches::kUseTestConfig);
 
   ViewsTestSuite::Initialize();
   service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
 }
 
-void ViewsMusTestSuite::Shutdown() {
+void ViewsAuraMusTestSuite::Shutdown() {
   service_manager_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views