Converts more services to use aura-mus

mash/webtest/webtest.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 "mash/webtest/webtest.h"
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/tracing/public/cpp/provider.h"
-#include "services/ui/public/cpp/window.h"
-#include "services/ui/public/cpp/window_tree_client.h"
-#include "ui/aura/mus/mus_util.h"
+#include "ui/aura/mus/window_port_mus.h"
+#include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_throbber.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "url/gurl.h"
 
 namespace views {
 class AuraInit;
 }
 
 namespace mash {
 namespace webtest {
+namespace {
+
+// Callback from Embed().
+void EmbedCallback(bool result) {}
+
+}  // namespace
 
 class UI : public views::WidgetDelegateView,
            public navigation::mojom::ViewClient {
  public:
   UI(Webtest* webtest,
      navigation::mojom::ViewPtr view,
      navigation::mojom::ViewClientRequest request)
       : webtest_(webtest),
         view_(std::move(view)),
         view_client_binding_(this, std::move(request)) {}
@@ skipping 28 matching lines @@
       ConvertPointToWidget(this, &offset);
       int width = local_bounds.width();
       int height = local_bounds.height();
       content_area_->SetBounds(
           gfx::Rect(offset.x(), offset.y(), width, height));
     }
   }
   void ViewHierarchyChanged(
       const views::View::ViewHierarchyChangedDetails& details) override {
     if (details.is_add && GetWidget() && !content_area_) {
-      ui::Window* window = aura::GetMusWindow(GetWidget()->GetNativeWindow());
-      content_area_ = window->window_tree()->NewWindow(nullptr);
+      aura::Window* window = GetWidget()->GetNativeWindow();
+      content_area_ = new aura::Window(nullptr);
+      content_area_->Init(ui::LAYER_NOT_DRAWN);
       window->AddChild(content_area_);
 
       ui::mojom::WindowTreeClientPtr client;
       view_->GetWindowTreeClient(GetProxy(&client));
-      content_area_->Embed(std::move(client));
+      const uint32_t embed_flags = 0;  // Nothing special.
+      aura::WindowPortMus::Get(content_area_)
+          ->Embed(std::move(client), embed_flags, base::Bind(&EmbedCallback));
     }
   }
 
   // navigation::mojom::ViewClient:
   void OpenURL(navigation::mojom::OpenURLParamsPtr params) override {}
   void LoadingStateChanged(bool is_loading) override {}
   void NavigationStateChanged(const GURL& url,
                               const std::string& title,
                               bool can_go_back,
                               bool can_go_forward) override {
@@ skipping 19 matching lines @@
   void NavigationPending(navigation::mojom::NavigationEntryPtr entry) override {
   }
   void NavigationCommitted(
       navigation::mojom::NavigationCommittedDetailsPtr details,
       int current_index) override {}
   void NavigationEntryChanged(navigation::mojom::NavigationEntryPtr entry,
                               int entry_index) override {}
   void NavigationListPruned(bool from_front, int count) override {}
 
   Webtest* webtest_;
-  ui::Window* content_area_ = nullptr;
+  aura::Window* content_area_ = nullptr;
   navigation::mojom::ViewPtr view_;
   mojo::Binding<navigation::mojom::ViewClient> view_client_binding_;
   base::string16 current_title_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
 Webtest::Webtest() {}
 Webtest::~Webtest() {}
 
 void Webtest::AddWindow(views::Widget* window) {
   windows_.push_back(window);
 }
 
 void Webtest::RemoveWindow(views::Widget* window) {
   auto it = std::find(windows_.begin(), windows_.end(), window);
   DCHECK(it != windows_.end());
   windows_.erase(it);
   if (windows_.empty())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void Webtest::OnStart() {
   tracing_.Initialize(context()->connector(), context()->identity().name());
   aura_init_ = base::MakeUnique<views::AuraInit>(
-      context()->connector(), context()->identity(), "views_mus_resources.pak");
-  window_manager_connection_ = views::WindowManagerConnection::Create(
-      context()->connector(), context()->identity());
+      context()->connector(), context()->identity(), "views_mus_resources.pak",
+      std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
 }
 
 bool Webtest::OnConnect(const service_manager::ServiceInfo& remote_info,
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Launchable>(this);
   return true;
 }
 
 void Webtest::Launch(uint32_t what, mojom::LaunchMode how) {
   bool reuse = how == mojom::LaunchMode::REUSE ||
@@ skipping 18 matching lines @@
   AddWindow(window);
 }
 
 void Webtest::Create(const service_manager::Identity& remote_identity,
                      mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace webtest
 }  // namespace mash