Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

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_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/desktop_window_tree_host_mus.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"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.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);
 }
 
@@ skipping 20 matching lines @@
     // since a new MessageLoop is created for each test.
     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());
   }
+  void SimulateNativeDestroy(Widget* widget) override {
+    // TODO: this should call through to a WindowTreeClientDelegate
+    // function that destroys the WindowTreeHost. http://crbug.com/663868.
+    widget->CloseNow();
+  }
 
  private:
   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) {
@@ skipping 68 matching lines @@
     service_manager_connector_ = connector->Clone();
     service_manager_identity_ = context_->identity();
     wait->Signal();
   }
 
   void TearDownConnections(base::WaitableEvent* wait) {
     context_.reset();
     wait->Signal();
   }
 
-  // Returns the name of the test executable, e.g. "exe:views_mus_unittests".
+  // Returns the name of the test executable, e.g.
+  // "exe:views_aura_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<service_manager::BackgroundServiceManager>
@@ skipping 20 matching lines @@
   ViewsTestSuite::Initialize();
   service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
 }
 
 void ViewsAuraMusTestSuite::Shutdown() {
   service_manager_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views