aura: rename WindowTreeClientPrivate to WindowTreeClientTestApi

This better indicates it is only for tests. BUG=none TEST=none Change-Id: Ife73cabedb8f7b653ad3f4102a143f1248aa508b Reviewed-on: https://chromium-review.googlesource.com/c/1313052 Reviewed-by: Evan Stade <estade@chromium.org> Commit-Queue: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#604788}
marcosholgado · Nov 2, 2018 · b806c43 · b806c43
1 parent 52511a0
commit b806c43
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 55 deletions.
diff --git a/ash/ws/ash_window_manager_unittest.cc b/ash/ws/ash_window_manager_unittest.cc
@@ -15,7 +15,7 @@
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/views/mus/mus_client.h"
@@ -77,7 +77,7 @@ TEST_F(AshWindowManagerTest, AddWindowToTabletMode) {
 
   // Flush all messages from the WindowTreeClient to ensure the window service
   // has finished Widget createion.
-  aura::WindowTreeClientPrivate(mus_client.window_tree_client())
+  aura::WindowTreeClientTestApi(mus_client.window_tree_client())
       .FlushForTesting();
 
   // Turn on tablet mode.

diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
@@ -265,8 +265,8 @@ jumbo_static_library("test_support") {
     "test/mus/test_window_tree_delegate.h",
     "test/mus/window_port_mus_test_helper.cc",
     "test/mus/window_port_mus_test_helper.h",
-    "test/mus/window_tree_client_private.cc",
-    "test/mus/window_tree_client_private.h",
+    "test/mus/window_tree_client_test_api.cc",
+    "test/mus/window_tree_client_test_api.h",
     "test/test_cursor_client.cc",
     "test/test_cursor_client.h",
     "test/test_focus_client.cc",

diff --git a/ui/aura/mus/embed_root.h b/ui/aura/mus/embed_root.h
@@ -45,7 +45,7 @@ class AURA_EXPORT EmbedRoot {
 
  private:
   friend class WindowTreeClient;
-  friend class WindowTreeClientPrivate;
+  friend class WindowTreeClientTestApi;
 
   EmbedRoot(WindowTreeClient* window_tree_client,
             EmbedRootDelegate* delegate,

diff --git a/ui/aura/mus/window_port_mus.h b/ui/aura/mus/window_port_mus.h
@@ -47,7 +47,7 @@ namespace aura {
 class ClientSurfaceEmbedder;
 class PropertyConverter;
 class WindowTreeClient;
-class WindowTreeClientPrivate;
+class WindowTreeClientTestApi;
 class WindowTreeHostMus;
 
 // WindowPortMus is a WindowPort that forwards calls to WindowTreeClient
@@ -108,7 +108,7 @@ class AURA_EXPORT WindowPortMus : public WindowPort, public WindowMus {
  private:
   friend class WindowPortMusTestHelper;
   friend class WindowTreeClient;
-  friend class WindowTreeClientPrivate;
+  friend class WindowTreeClientTestApi;
   friend class WindowTreeHostMus;
   friend class HitTestDataProviderAuraTest;
 

diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h
@@ -73,8 +73,8 @@ class TopmostWindowTracker;
 class WindowMus;
 class WindowPortMus;
 class WindowTreeClientDelegate;
-class WindowTreeClientPrivate;
 class WindowTreeClientObserver;
+class WindowTreeClientTestApi;
 class WindowTreeClientTestObserver;
 class WindowTreeHostMus;
 
@@ -215,7 +215,7 @@ class AURA_EXPORT WindowTreeClient
   friend class InFlightVisibleChange;
   friend class TopmostWindowTracker;
   friend class WindowPortMus;
-  friend class WindowTreeClientPrivate;
+  friend class WindowTreeClientTestApi;
 
   enum class Origin {
     CLIENT,

diff --git a/ui/aura/mus/window_tree_client_unittest.cc b/ui/aura/mus/window_tree_client_unittest.cc
@@ -39,7 +39,7 @@
 #include "ui/aura/test/aura_mus_test_base.h"
 #include "ui/aura/test/mus/test_window_tree.h"
 #include "ui/aura/test/mus/window_port_mus_test_helper.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_window_targeter.h"
@@ -87,7 +87,7 @@ std::unique_ptr<Window> CreateWindowUsingId(
   ws::mojom::WindowData window_data;
   window_data.window_id = server_id;
   WindowMus* window_mus =
-      WindowTreeClientPrivate(window_tree_client)
+      WindowTreeClientTestApi(window_tree_client)
           .NewWindowFromWindowData(WindowMus::Get(parent), window_data);
   // WindowTreeClient implicitly creates the Window but doesn't own it.
   // Pass ownership to the caller.
@@ -2558,7 +2558,7 @@ TEST_F(WindowTreeClientTest, ChangeFocusInEmbedRootWindow) {
   TestEmbedRootDelegate embed_root_delegate;
   std::unique_ptr<EmbedRoot> embed_root =
       window_tree_client_impl()->CreateEmbedRoot(&embed_root_delegate);
-  WindowTreeClientPrivate(window_tree_client_impl())
+  WindowTreeClientTestApi(window_tree_client_impl())
       .CallOnEmbedFromToken(embed_root.get());
   ASSERT_TRUE(embed_root->window());
   window_tree_client()->OnWindowFocused(server_id(embed_root->window()));

diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
@@ -19,7 +19,7 @@
 #include "ui/aura/test/mus/test_window_tree.h"
 #include "ui/aura/test/mus/test_window_tree_client_delegate.h"
 #include "ui/aura/test/mus/test_window_tree_client_setup.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_parenting_client.h"

diff --git a/ui/aura/test/event_generator_delegate_aura.cc b/ui/aura/test/event_generator_delegate_aura.cc
@@ -13,7 +13,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/test/env_test_helper.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"

diff --git a/ui/aura/test/mus/change_completion_waiter.cc b/ui/aura/test/mus/change_completion_waiter.cc
@@ -10,7 +10,7 @@
 #include "ui/aura/mus/in_flight_change.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 
 namespace aura {
 namespace test {
@@ -49,7 +49,7 @@ AllChangesCompletedWaiter::AllChangesCompletedWaiter(WindowTreeClient* client)
 AllChangesCompletedWaiter::~AllChangesCompletedWaiter() = default;
 
 void AllChangesCompletedWaiter::Wait() {
-  if (!WindowTreeClientPrivate(client_).HasInFlightChanges())
+  if (!WindowTreeClientTestApi(client_).HasInFlightChanges())
     return;
 
   client_->AddTestObserver(this);
@@ -64,7 +64,7 @@ void AllChangesCompletedWaiter::OnChangeStarted(uint32_t change_id,
 void AllChangesCompletedWaiter::OnChangeCompleted(uint32_t change_id,
                                                   aura::ChangeType type,
                                                   bool success) {
-  if (!WindowTreeClientPrivate(client_).HasInFlightChanges())
+  if (!WindowTreeClientTestApi(client_).HasInFlightChanges())
     quit_closure_.Run();
 }
 

diff --git a/ui/aura/test/mus/test_window_tree_client_setup.cc b/ui/aura/test/mus/test_window_tree_client_setup.cc
@@ -5,7 +5,7 @@
 #include "ui/aura/test/mus/test_window_tree_client_setup.h"
 
 #include "ui/aura/test/mus/test_window_tree.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/test/window_occlusion_tracker_test_api.h"
 #include "ui/aura/window_occlusion_tracker.h"
 #include "ui/display/display.h"
@@ -22,14 +22,14 @@ TestWindowTreeClientSetup::~TestWindowTreeClientSetup() {
 void TestWindowTreeClientSetup::Init(
     WindowTreeClientDelegate* window_tree_delegate) {
   CommonInit(window_tree_delegate);
-  WindowTreeClientPrivate(window_tree_client_.get())
+  WindowTreeClientTestApi(window_tree_client_.get())
       .OnEmbed(window_tree_.get());
 }
 
 void TestWindowTreeClientSetup::InitWithoutEmbed(
     WindowTreeClientDelegate* window_tree_delegate) {
   CommonInit(window_tree_delegate);
-  WindowTreeClientPrivate(window_tree_client_.get())
+  WindowTreeClientTestApi(window_tree_client_.get())
       .SetTree(window_tree_.get());
 }
 
@@ -48,15 +48,15 @@ void TestWindowTreeClientSetup::CommonInit(
   window_tree_ = std::make_unique<TestWindowTree>();
   window_tree_->set_delegate(this);
   window_tree_client_ =
-      WindowTreeClientPrivate::CreateWindowTreeClient(window_tree_delegate);
+      WindowTreeClientTestApi::CreateWindowTreeClient(window_tree_delegate);
   window_tree_->set_client(window_tree_client_.get());
 
   window_occlusion_tracker_ = test::WindowOcclusionTrackerTestApi::Create();
 }
 
 void TestWindowTreeClientSetup::TrackOcclusionState(ws::Id window_id) {
   window_occlusion_tracker_->Track(
-      WindowTreeClientPrivate(window_tree_client_.get())
+      WindowTreeClientTestApi(window_tree_client_.get())
           .GetWindowByServerId(window_id));
 }
 

diff --git a/...ra/test/mus/window_tree_client_private.cc → ...a/test/mus/window_tree_client_test_api.cc b/...ra/test/mus/window_tree_client_private.cc → ...a/test/mus/window_tree_client_test_api.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 
 #include "base/unguessable_token.h"
 #include "ui/aura/mus/embed_root.h"
@@ -19,95 +19,95 @@ constexpr int64_t kDisplayId = 1;
 
 }  // namespace
 
-WindowTreeClientPrivate::WindowTreeClientPrivate(
+WindowTreeClientTestApi::WindowTreeClientTestApi(
     WindowTreeClient* tree_client_impl)
     : tree_client_impl_(tree_client_impl) {}
 
-WindowTreeClientPrivate::WindowTreeClientPrivate(Window* window)
-    : WindowTreeClientPrivate(WindowPortMus::Get(window)->window_tree_client_) {
+WindowTreeClientTestApi::WindowTreeClientTestApi(Window* window)
+    : WindowTreeClientTestApi(WindowPortMus::Get(window)->window_tree_client_) {
 }
 
-WindowTreeClientPrivate::~WindowTreeClientPrivate() {}
+WindowTreeClientTestApi::~WindowTreeClientTestApi() {}
 
 // static
 std::unique_ptr<WindowTreeClient>
-WindowTreeClientPrivate::CreateWindowTreeClient(
+WindowTreeClientTestApi::CreateWindowTreeClient(
     WindowTreeClientDelegate* window_tree_delegate) {
   std::unique_ptr<WindowTreeClient> wtc(new WindowTreeClient(
       nullptr, window_tree_delegate, nullptr, nullptr, false));
   return wtc;
 }
 
-void WindowTreeClientPrivate::OnEmbed(ws::mojom::WindowTree* window_tree) {
+void WindowTreeClientTestApi::OnEmbed(ws::mojom::WindowTree* window_tree) {
   const ws::Id focused_window_id = 0;
   tree_client_impl_->OnEmbedImpl(window_tree, CreateWindowDataForEmbed(),
                                  kDisplayId, focused_window_id, true,
                                  base::nullopt);
 }
 
-void WindowTreeClientPrivate::CallOnObservedInputEvent(
+void WindowTreeClientTestApi::CallOnObservedInputEvent(
     std::unique_ptr<ui::Event> event) {
   tree_client_impl_->OnObservedInputEvent(std::move(event));
 }
 
-void WindowTreeClientPrivate::CallOnCaptureChanged(Window* new_capture,
+void WindowTreeClientTestApi::CallOnCaptureChanged(Window* new_capture,
                                                    Window* old_capture) {
   tree_client_impl_->OnCaptureChanged(
       new_capture ? WindowPortMus::Get(new_capture)->server_id() : 0,
       old_capture ? WindowPortMus::Get(old_capture)->server_id() : 0);
 }
 
-void WindowTreeClientPrivate::CallOnEmbedFromToken(EmbedRoot* embed_root) {
+void WindowTreeClientTestApi::CallOnEmbedFromToken(EmbedRoot* embed_root) {
   embed_root->OnScheduledEmbedForExistingClient(
       base::UnguessableToken::Create());
   tree_client_impl_->OnEmbedFromToken(embed_root->token(),
                                       CreateWindowDataForEmbed(), kDisplayId,
                                       base::Optional<viz::LocalSurfaceId>());
 }
 
-void WindowTreeClientPrivate::SetTree(ws::mojom::WindowTree* window_tree) {
+void WindowTreeClientTestApi::SetTree(ws::mojom::WindowTree* window_tree) {
   tree_client_impl_->WindowTreeConnectionEstablished(window_tree);
 }
 
-ws::mojom::WindowTree* WindowTreeClientPrivate::SwapTree(
+ws::mojom::WindowTree* WindowTreeClientTestApi::SwapTree(
     ws::mojom::WindowTree* window_tree) {
   ws::mojom::WindowTree* old = tree_client_impl_->tree_;
   tree_client_impl_->tree_ = window_tree;
   return old;
 }
 
-bool WindowTreeClientPrivate::HasEventObserver() {
+bool WindowTreeClientTestApi::HasEventObserver() {
   return !tree_client_impl_->event_type_to_observer_count_.empty();
 }
 
-Window* WindowTreeClientPrivate::GetWindowByServerId(ws::Id id) {
+Window* WindowTreeClientTestApi::GetWindowByServerId(ws::Id id) {
   WindowMus* window = tree_client_impl_->GetWindowByServerId(id);
   return window ? window->GetWindow() : nullptr;
 }
 
-WindowMus* WindowTreeClientPrivate::NewWindowFromWindowData(
+WindowMus* WindowTreeClientTestApi::NewWindowFromWindowData(
     WindowMus* parent,
     const ws::mojom::WindowData& window_data) {
   return tree_client_impl_->NewWindowFromWindowData(parent, window_data);
 }
 
-bool WindowTreeClientPrivate::HasInFlightChanges() {
+bool WindowTreeClientTestApi::HasInFlightChanges() {
   return !tree_client_impl_->in_flight_map_.empty();
 }
 
-bool WindowTreeClientPrivate::HasChangeInFlightOfType(ChangeType type) {
+bool WindowTreeClientTestApi::HasChangeInFlightOfType(ChangeType type) {
   for (auto& pair : tree_client_impl_->in_flight_map_) {
     if (pair.second->change_type() == type)
       return true;
   }
   return false;
 }
 
-void WindowTreeClientPrivate::FlushForTesting() {
+void WindowTreeClientTestApi::FlushForTesting() {
   tree_client_impl_->binding_.FlushForTesting();
 }
 
-ws::mojom::WindowDataPtr WindowTreeClientPrivate::CreateWindowDataForEmbed() {
+ws::mojom::WindowDataPtr WindowTreeClientTestApi::CreateWindowDataForEmbed() {
   ws::mojom::WindowDataPtr root_data(ws::mojom::WindowData::New());
   root_data->parent_id = 0;
   // OnEmbed() is passed windows the client doesn't own. Use a |client_id| of 1

diff --git a/...ura/test/mus/window_tree_client_private.h → ...ra/test/mus/window_tree_client_test_api.h b/...ura/test/mus/window_tree_client_private.h → ...ra/test/mus/window_tree_client_test_api.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_
-#define UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_
+#ifndef UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_TEST_API_H_
+#define UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_TEST_API_H_
 
 #include <stdint.h>
 
@@ -18,7 +18,7 @@ namespace ws {
 namespace mojom {
 class WindowTree;
 }
-}
+}  // namespace ws
 
 namespace ui {
 class Event;
@@ -35,11 +35,11 @@ class WindowTreeClient;
 enum class ChangeType;
 
 // Use to access implementation details of WindowTreeClient.
-class WindowTreeClientPrivate {
+class WindowTreeClientTestApi {
  public:
-  explicit WindowTreeClientPrivate(WindowTreeClient* tree_client_impl);
-  explicit WindowTreeClientPrivate(Window* window);
-  ~WindowTreeClientPrivate();
+  explicit WindowTreeClientTestApi(WindowTreeClient* tree_client_impl);
+  explicit WindowTreeClientTestApi(Window* window);
+  ~WindowTreeClientTestApi();
 
   static std::unique_ptr<WindowTreeClient> CreateWindowTreeClient(
       WindowTreeClientDelegate* window_tree_delegate);
@@ -82,9 +82,9 @@ class WindowTreeClientPrivate {
 
   WindowTreeClient* tree_client_impl_;
 
-  DISALLOW_COPY_AND_ASSIGN(WindowTreeClientPrivate);
+  DISALLOW_COPY_AND_ASSIGN(WindowTreeClientTestApi);
 };
 
 }  // namespace aura
 
-#endif  // UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_
+#endif  // UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_TEST_API_H_
diff --git a/ui/aura/test/test_screen.cc b/ui/aura/test/test_screen.cc
@@ -11,7 +11,7 @@
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/mus/window_tree_host_mus_init_params.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"

diff --git a/ui/views/mus/desktop_window_tree_host_mus_unittest.cc b/ui/views/mus/desktop_window_tree_host_mus_unittest.cc
@@ -19,7 +19,7 @@
 #include "ui/aura/mus/window_tree_client_test_observer.h"
 #include "ui/aura/test/mus/change_completion_waiter.h"
 #include "ui/aura/test/mus/test_window_tree.h"
-#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/test/mus/window_tree_client_test_api.h"
 #include "ui/aura/window.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
@@ -220,7 +220,7 @@ TEST_F(DesktopWindowTreeHostMusTest, BecomesActiveOnMousePress) {
 
   // The mouse event should generate a focus request to the server.
   EXPECT_TRUE(
-      aura::WindowTreeClientPrivate(MusClient::Get()->window_tree_client())
+      aura::WindowTreeClientTestApi(MusClient::Get()->window_tree_client())
           .HasChangeInFlightOfType(aura::ChangeType::FOCUS));
 }
 
@@ -497,7 +497,7 @@ TEST_F(DesktopWindowTreeHostMusTest,
   // Swap the WindowTree implementation to verify SetClientArea() is called when
   // the bounds change.
   aura::TestWindowTree test_window_tree;
-  aura::WindowTreeClientPrivate window_tree_client_private(
+  aura::WindowTreeClientTestApi window_tree_client_private(
       MusClient::Get()->window_tree_client());
   ws::mojom::WindowTree* old_tree =
       window_tree_client_private.SwapTree(&test_window_tree);