Removes code using mus client lib

ui/views/corewm/tooltip_controller_unittest.cc

 // Copyright (c) 2013 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/corewm/tooltip_controller.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 70 matching lines @@
 class TooltipControllerTest : public ViewsTestBase {
  public:
   TooltipControllerTest() : view_(NULL) {}
   ~TooltipControllerTest() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
 
     // TODO: these tests use GetContext(). That should go away for aura-mus
     // client. http://crbug.com/663781.
-    if (IsAuraMusClient())
+    if (IsMus())
       return;
 
     aura::Window* root_window = GetContext();
 
     new wm::DefaultActivationClient(root_window);
 #if defined(OS_CHROMEOS)
     tooltip_aura_ = new views::corewm::TooltipAura();
     controller_.reset(new TooltipController(
         std::unique_ptr<views::corewm::Tooltip>(tooltip_aura_)));
     root_window->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window, controller_.get());
 #endif
     widget_.reset(CreateWidget(root_window));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
     helper_.reset(new TooltipControllerTestHelper(
                       GetController(widget_.get())));
     generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
   }
 
   void TearDown() override {
-    if (!IsAuraMusClient()) {
+    if (!IsMus()) {
 #if defined(OS_CHROMEOS)
       aura::Window* root_window = GetContext();
       root_window->RemovePreTargetHandler(controller_.get());
       aura::client::SetTooltipClient(root_window, NULL);
       controller_.reset();
 #endif
       generator_.reset();
       helper_.reset();
       widget_.reset();
     }
@@ skipping 48 matching lines @@
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
 };
 
 TEST_F(TooltipControllerTest, ViewTooltip) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
   generator_->MoveMouseToCenterOf(GetWindow());
 
   EXPECT_EQ(GetWindow(), GetRootWindow()->GetEventHandlerForPoint(
       generator_->current_location()));
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(GetWindow()));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(GetWindow(), helper_->GetTooltipWindow());
 
   // Fire tooltip timer so tooltip becomes visible.
   helper_->FireTooltipTimer();
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   generator_->MoveMouseBy(1, 0);
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(GetWindow()));
   EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
   EXPECT_EQ(GetWindow(), helper_->GetTooltipWindow());
 }
 
 #if defined(OS_CHROMEOS)
 // crbug.com/664370.
 TEST_F(TooltipControllerTest, MaxWidth) {
-  // TODO: these tests use GetContext(). That should go away for aura-mus
-  // client. http://crbug.com/663781.
-  if (IsAuraMusClient() || IsMus())
+  // TODO: these tests use GetContext(). That should go away for mus client.
+  // http://crbug.com/663781.
+  if (IsMus())
     return;
 
   base::string16 text = base::ASCIIToUTF16(
       "Really really realy long long long long  long tooltips that exceeds max "
       "width");
   view_->set_tooltip_text(text);
   gfx::Point center = GetWindow()->bounds().CenterPoint();
   generator_->MoveMouseTo(center);
 
   // Fire tooltip timer so tooltip becomes visible.
   helper_->FireTooltipTimer();
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   gfx::RenderText* render_text =
       test::TooltipAuraTestApi(tooltip_aura_).GetRenderText();
 
   int max = helper_->controller()->GetMaxWidth(center);
   EXPECT_EQ(max, render_text->display_rect().width());
 }
 #endif
 
 TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   PrepareSecondView();
   aura::Window* window = GetWindow();
   aura::Window* root_window = GetRootWindow();
 
@@ skipping 19 matching lines @@
     base::string16 expected_tooltip;  // = ""
     EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
     EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
     EXPECT_EQ(window, helper_->GetTooltipWindow());
   }
 }
 
 TEST_F(TooltipControllerTest, EnableOrDisableTooltips) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   generator_->MoveMouseRelativeTo(GetWindow(), view_->bounds().CenterPoint());
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
 
   // Fire tooltip timer so tooltip becomes visible.
@@ skipping 10 matching lines @@
   helper_->controller()->SetTooltipsEnabled(true);
   EXPECT_FALSE(helper_->IsTooltipVisible());
   helper_->FireTooltipTimer();
   EXPECT_TRUE(helper_->IsTooltipVisible());
 }
 
 // Verifies tooltip isn't shown if tooltip text consists entirely of whitespace.
 TEST_F(TooltipControllerTest, DontShowEmptyTooltips) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("                     "));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   generator_->MoveMouseRelativeTo(GetWindow(), view_->bounds().CenterPoint());
 
   helper_->FireTooltipTimer();
   EXPECT_FALSE(helper_->IsTooltipVisible());
 }
 
 TEST_F(TooltipControllerTest, TooltipHidesOnKeyPressAndStaysHiddenUntilChange) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text for view 1"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   TooltipTestView* view2 = PrepareSecondView();
   view2->set_tooltip_text(ASCIIToUTF16("Tooltip Text for view 2"));
 
   aura::Window* window = GetWindow();
@@ skipping 33 matching lines @@
   EXPECT_TRUE(helper_->IsTooltipShownTimerRunning());
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text for view 2");
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
   EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
   EXPECT_EQ(window, helper_->GetTooltipWindow());
 }
 
 TEST_F(TooltipControllerTest, TooltipHidesOnTimeoutAndStaysHiddenUntilChange) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text for view 1"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   TooltipTestView* view2 = PrepareSecondView();
   view2->set_tooltip_text(ASCIIToUTF16("Tooltip Text for view 2"));
 
   aura::Window* window = GetWindow();
@@ skipping 33 matching lines @@
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text for view 2");
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
   EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
   EXPECT_EQ(window, helper_->GetTooltipWindow());
 }
 
 // Verifies a mouse exit event hides the tooltips.
 TEST_F(TooltipControllerTest, HideOnExit) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   generator_->MoveMouseToCenterOf(GetWindow());
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(GetWindow()));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(GetWindow(), helper_->GetTooltipWindow());
 
   // Fire tooltip timer so tooltip becomes visible.
   helper_->FireTooltipTimer();
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   generator_->SendMouseExit();
   EXPECT_FALSE(helper_->IsTooltipVisible());
 }
 
 TEST_F(TooltipControllerTest, ReshowOnClickAfterEnterExit) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   // Owned by |view_|.
   TooltipTestView* v1 = new TooltipTestView;
   TooltipTestView* v2 = new TooltipTestView;
   view_->AddChildView(v1);
   view_->AddChildView(v2);
   gfx::Rect view_bounds(view_->GetLocalBounds());
   view_bounds.set_height(view_bounds.height() / 2);
   v1->SetBoundsRect(view_bounds);
@@ skipping 42 matching lines @@
 
 class TooltipControllerCaptureTest : public TooltipControllerTest {
  public:
   TooltipControllerCaptureTest() {}
   ~TooltipControllerCaptureTest() override {}
 
   void SetUp() override {
     TooltipControllerTest::SetUp();
     // TODO: these tests use GetContext(). That should go away for aura-mus
     // client. http://crbug.com/663781.
-    if (IsAuraMusClient())
+    if (IsMus())
       return;
 
     aura::client::SetScreenPositionClient(GetRootWindow(),
                                           &screen_position_client_);
   }
 
   void TearDown() override {
-    if (!IsAuraMusClient())
+    if (!IsMus())
       aura::client::SetScreenPositionClient(GetRootWindow(), NULL);
     TooltipControllerTest::TearDown();
   }
 
  private:
   wm::DefaultScreenPositionClient screen_position_client_;
   std::unique_ptr<display::Screen> desktop_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerCaptureTest);
 };
 
 // Verifies when capture is released the TooltipController resets state.
 // Flaky on all builders.  http://crbug.com/388268
 TEST_F(TooltipControllerCaptureTest, DISABLED_CloseOnCaptureLost) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   view_->GetWidget()->SetCapture(view_);
   RunPendingMessages();
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   generator_->MoveMouseToCenterOf(GetWindow());
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(GetWindow()));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(GetWindow(), helper_->GetTooltipWindow());
@@ skipping 11 matching lines @@
 // consider z-order.
 // Disabled on Windows due to failing bots. http://crbug.com/604479
 #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
 #define MAYBE_Capture DISABLED_Capture
 #else
 #define MAYBE_Capture Capture
 #endif
 // Verifies the correct window is found for tooltips when there is a capture.
 TEST_F(TooltipControllerCaptureTest, MAYBE_Capture) {
   // Currently, capture in one test affects capture in other tests.
-  // TODO: these tests use GetContext(). That should go away for aura-mus
-  // client. http://crbug.com/663781.
-  if (IsMus() || IsAuraMusClient())
+  // TODO: these tests use GetContext(). That should go away for mus client.
+  // http://crbug.com/663781.
+  if (IsMus())
     return;
 
   const base::string16 tooltip_text(ASCIIToUTF16("1"));
   const base::string16 tooltip_text2(ASCIIToUTF16("2"));
 
   widget_->SetBounds(gfx::Rect(0, 0, 200, 200));
   view_->set_tooltip_text(tooltip_text);
 
   std::unique_ptr<views::Widget> widget2(CreateWidget(GetContext()));
   widget2->SetContentsView(new View);
@@ skipping 145 matching lines @@
 class TooltipControllerTest3 : public ViewsTestBase {
  public:
   TooltipControllerTest3() : test_tooltip_(new TestTooltip) {}
   ~TooltipControllerTest3() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
 
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
-    return;
+    if (IsMus())
+      return;
 
     aura::Window* root_window = GetContext();
     new wm::DefaultActivationClient(root_window);
 
     widget_.reset(CreateWidget(root_window));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
 
     generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
     controller_.reset(new TooltipController(
         std::unique_ptr<views::corewm::Tooltip>(test_tooltip_)));
     GetRootWindow()->RemovePreTargetHandler(
         static_cast<TooltipController*>(aura::client::GetTooltipClient(
             widget_->GetNativeWindow()->GetRootWindow())));
     GetRootWindow()->AddPreTargetHandler(controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
     SetTooltipClient(GetRootWindow(), controller_.get());
   }
 
   void TearDown() override {
-    if (!IsAuraMusClient()) {
+    if (!IsMus()) {
       GetRootWindow()->RemovePreTargetHandler(controller_.get());
       aura::client::SetTooltipClient(GetRootWindow(), NULL);
 
       controller_.reset();
       generator_.reset();
       helper_.reset();
       widget_.reset();
     }
     ViewsTestBase::TearDown();
   }
@@ skipping 16 matching lines @@
 #endif
 
   aura::Window* GetRootWindow() { return GetWindow()->GetRootWindow(); }
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest3);
 };
 
 TEST_F(TooltipControllerTest3, TooltipPositionChangesOnTwoViewsWithSameLabel) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
-  if (IsAuraMusClient())
+  if (IsMus())
     return;
 
   // Owned by |view_|.
   // These two views have the same tooltip text
   TooltipTestView* v1 = new TooltipTestView;
   TooltipTestView* v2 = new TooltipTestView;
   // v1_1 is a view inside v1 that has an identical tooltip text to that of v1
   // and v2
   TooltipTestView* v1_1 = new TooltipTestView;
   // v2_1 is a view inside v2 that has an identical tooltip text to that of v1
@@ skipping 89 matching lines @@
   helper_->FireTooltipTimer();
   tooltip_bounds1 = test_tooltip_->location();
 
   EXPECT_NE(tooltip_bounds1_1, tooltip_bounds1);
   EXPECT_EQ(reference_string, helper_->GetTooltipText());
 }
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views