ShellTest -> ServiceTest

services/ui/ws/window_tree_client_unittest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
-#include "services/shell/public/cpp/shell_test.h"
+#include "services/shell/public/cpp/service_test.h"
 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/test_change_tracker.h"
 
 using mojo::Array;
 using shell::Connection;
 using mojo::InterfaceRequest;
 using shell::Service;
@@ skipping 451 matching lines @@
   }
 
   std::unique_ptr<TestWindowTreeClient> client_impl_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientFactory);
 };
 
 }  // namespace
 
-class WindowTreeClientTest : public WindowServerShellTestBase {
+class WindowTreeClientTest : public WindowServerServiceTestBase {
  public:
   WindowTreeClientTest()
       : client_id_1_(0), client_id_2_(0), root_window_id_(0) {}
 
   ~WindowTreeClientTest() override {}
 
  protected:
   // Returns the changes from the various clients.
   std::vector<Change>* changes1() { return wt_client1_->tracker()->changes(); }
   std::vector<Change>* changes2() { return wt_client2_->tracker()->changes(); }
@@ skipping 71 matching lines @@
     }
     client->WaitForOnEmbed();
 
     EXPECT_EQ("OnEmbed",
               SingleChangeToDescription(*client->tracker()->changes()));
     if (client_id)
       *client_id = (*client->tracker()->changes())[0].client_id;
     return client;
   }
 
-  // WindowServerShellTestBase:
+  // WindowServerServiceTestBase:
   bool OnConnect(shell::Connection* connection) override {
     connection->AddInterface(client_factory_.get());
     return true;
   }
 
   void SetUp() override {
     client_factory_.reset(new WindowTreeClientFactory());
 
-    WindowServerShellTestBase::SetUp();
+    WindowServerServiceTestBase::SetUp();
 
     mojom::WindowTreeHostFactoryPtr factory;
     connector()->ConnectToInterface("mojo:ui", &factory);
 
     mojom::WindowTreeClientPtr tree_client_ptr;
     wt_client1_.reset(new TestWindowTreeClient());
     wt_client1_->Bind(GetProxy(&tree_client_ptr));
 
     factory->CreateWindowTreeHost(GetProxy(&host_),
                                   std::move(tree_client_ptr));
 
     // Next we should get an embed call on the "window manager" client.
     wt_client1_->WaitForOnEmbed();
 
     ASSERT_EQ(1u, changes1()->size());
     EXPECT_EQ(CHANGE_TYPE_EMBED, (*changes1())[0].type);
     // All these tests assume 1 for the client id. The only real assertion here
     // is the client id is not zero, but adding this as rest of code here
     // assumes 1.
     ASSERT_GT((*changes1())[0].client_id, 0);
     client_id_1_ = (*changes1())[0].client_id;
     ASSERT_FALSE((*changes1())[0].windows.empty());
     root_window_id_ = (*changes1())[0].windows[0].window_id;
     ASSERT_EQ(root_window_id_, wt_client1_->root_window_id());
     changes1()->clear();
   }
 
   void TearDown() override {
     // Destroy these before the message loop is destroyed (happens in
-    // WindowServerShellTestBase::TearDown).
+    // WindowServerServiceTestBase::TearDown).
     wt_client1_.reset();
     wt_client2_.reset();
     wt_client3_.reset();
     client_factory_.reset();
-    WindowServerShellTestBase::TearDown();
+    WindowServerServiceTestBase::TearDown();
   }
 
   std::unique_ptr<TestWindowTreeClient> wt_client1_;
   std::unique_ptr<TestWindowTreeClient> wt_client2_;
   std::unique_ptr<TestWindowTreeClient> wt_client3_;
 
   mojom::WindowTreeHostPtr host_;
 
  private:
   std::unique_ptr<WindowTreeClientFactory> client_factory_;
@@ skipping 1400 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui