Renames mojo:desktop_wm to mojo:ash

ash/mus/window_manager_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "ash/public/interfaces/user_window_controller.mojom.h"
@@ skipping 34 matching lines @@
 };
 
 void OnEmbed(bool success) {
   ASSERT_TRUE(success);
 }
 
 class TestUserWindowObserver : public mojom::UserWindowObserver {
  public:
   explicit TestUserWindowObserver(shell::Connector* connector)
       : binding_(this), window_count_(0u), expected_window_count_(0u) {
-    connector->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);
+    connector->ConnectToInterface("mojo:ash", &user_window_controller_);
     user_window_controller_->AddUserWindowObserver(
         binding_.CreateInterfacePtrAndBind());
   }
 
   ~TestUserWindowObserver() override {}
 
   bool WaitUntilWindowCountReaches(size_t expected) {
     DCHECK(quit_callback_.is_null());
     if (window_count_ != expected) {
       base::RunLoop loop;
@@ skipping 41 matching lines @@
   size_t window_count_;
   size_t expected_window_count_;
   base::Closure quit_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestUserWindowObserver);
 };
 
 TEST_F(WindowManagerTest, OpenWindow) {
   WindowTreeClientDelegate window_tree_delegate;
 
-  // Bring up the the desktop_wm.
-  connector()->Connect("mojo:desktop_wm");
+  connector()->Connect("mojo:ash");
 
   // Connect to mus and create a new top level window. The request goes to
-  // the |desktop_wm|, but is async.
+  // |ash|, but is async.
   std::unique_ptr<::mus::WindowTreeClient> client(
       new ::mus::WindowTreeClient(&window_tree_delegate, nullptr, nullptr));
   client->ConnectViaWindowTreeFactory(connector());
   ::mus::Window* top_level_window = client->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(top_level_window);
   ::mus::Window* child_window = client->NewWindow();
   ASSERT_TRUE(child_window);
   top_level_window->AddChild(child_window);
 
   // Create another WindowTreeClient by way of embedding in
   // |child_window|. This blocks until it succeeds.
   ::mus::mojom::WindowTreeClientPtr tree_client;
   auto tree_client_request = GetProxy(&tree_client);
   child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed));
   std::unique_ptr<::mus::WindowTreeClient> child_client(
       new ::mus::WindowTreeClient(&window_tree_delegate, nullptr,
                                   std::move(tree_client_request)));
   child_client->WaitForEmbed();
   ASSERT_TRUE(!child_client->GetRoots().empty());
 }
 
 TEST_F(WindowManagerTest, OpenWindowAndClose) {
-  // Bring up the the desktop_wm.
-  connector()->Connect("mojo:desktop_wm");
+  connector()->Connect("mojo:ash");
 
   TestUserWindowObserver observer(connector());
 
   // Connect to mus and create a new top level window.
   WindowTreeClientDelegate window_tree_delegate;
   std::unique_ptr<::mus::WindowTreeClient> client(
       new ::mus::WindowTreeClient(&window_tree_delegate, nullptr, nullptr));
   client->ConnectViaWindowTreeFactory(connector());
   ::mus::Window* top_level_window = client->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(top_level_window);
 
   observer.WaitUntilWindowCountReaches(1u);
   client.reset();
   observer.WaitUntilWindowCountReaches(0u);
 }
 
 }  // namespace mus
 }  // namespace ash