Makes CaptureController be created and owned by WMState

ui/wm/core/capture_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/wm/core/capture_controller.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 78 matching lines @@
             : aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate());
     window->set_id(id);
     window->Init(ui::LAYER_TEXTURED);
     parent->AddChild(window);
     window->SetBounds(bounds);
     window->Show();
     return window;
   }
 
   aura::Window* GetCaptureWindow() {
-    return capture_controller_->capture_client()->GetCaptureWindow();
-  }
-
-  aura::Window* GetSecondCaptureWindow() {
-    return second_capture_controller_->capture_client()->GetCaptureWindow();
+    return CaptureController::Get()->GetCaptureWindow();
   }
 
   std::unique_ptr<ScopedCaptureClient> capture_controller_;
   std::unique_ptr<aura::WindowTreeHost> second_host_;
   std::unique_ptr<ScopedCaptureClient> second_capture_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptureControllerTest);
 };
 
 // Makes sure that internal details that are set on mouse down (such as
@@ skipping 20 matching lines @@
   EXPECT_EQ(NULL, host()->dispatcher()->mouse_pressed_handler());
 }
 
 // Makes sure that when one window gets capture, it forces the release on the
 // other. This is needed has to be handled explicitly on Linux, and is a sanity
 // check on Windows.
 TEST_F(CaptureControllerTest, ResetOtherWindowCaptureOnCapture) {
   // Create a window inside the WindowEventDispatcher.
   std::unique_ptr<aura::Window> w1(CreateNormalWindow(1, root_window(), NULL));
   w1->SetCapture();
-  // Both capture clients should return the same capture window.
   EXPECT_EQ(w1.get(), GetCaptureWindow());
-  EXPECT_EQ(w1.get(), GetSecondCaptureWindow());
 
   // Build a window in the second WindowEventDispatcher and give it capture.
-  // Both capture clients should return the same capture window.
   std::unique_ptr<aura::Window> w2(
       CreateNormalWindow(2, second_host_->window(), NULL));
   w2->SetCapture();
   EXPECT_EQ(w2.get(), GetCaptureWindow());
-  EXPECT_EQ(w2.get(), GetSecondCaptureWindow());
 }
 
 // Verifies the touch target for the WindowEventDispatcher gets reset on
 // releasing capture.
 TEST_F(CaptureControllerTest, TouchTargetResetOnCaptureChange) {
   // Create a window inside the WindowEventDispatcher.
   std::unique_ptr<aura::Window> w1(CreateNormalWindow(1, root_window(), NULL));
   ui::test::EventGenerator event_generator1(root_window());
   event_generator1.PressTouch();
   w1->SetCapture();
-  // Both capture clients should return the same capture window.
   EXPECT_EQ(w1.get(), GetCaptureWindow());
-  EXPECT_EQ(w1.get(), GetSecondCaptureWindow());
 
   // Build a window in the second WindowEventDispatcher and give it capture.
-  // Both capture clients should return the same capture window.
   std::unique_ptr<aura::Window> w2(
       CreateNormalWindow(2, second_host_->window(), NULL));
   w2->SetCapture();
   EXPECT_EQ(w2.get(), GetCaptureWindow());
-  EXPECT_EQ(w2.get(), GetSecondCaptureWindow());
 
   // Release capture on the window. Releasing capture should reset the touch
   // target of the first WindowEventDispatcher (as it no longer contains the
   // capture target).
   w2->ReleaseCapture();
-  EXPECT_EQ(static_cast<aura::Window*>(NULL), GetCaptureWindow());
-  EXPECT_EQ(static_cast<aura::Window*>(NULL), GetSecondCaptureWindow());
+  EXPECT_EQ(nullptr, GetCaptureWindow());
 }
 
 // Test that native capture is released properly when the window with capture
 // is reparented to a different root window while it has capture.
 TEST_F(CaptureControllerTest, ReparentedWhileCaptured) {
   std::unique_ptr<TestCaptureDelegate> delegate(new TestCaptureDelegate);
   ScopedCaptureClient::TestApi(capture_controller_.get())
       .SetDelegate(delegate.get());
   std::unique_ptr<TestCaptureDelegate> delegate2(new TestCaptureDelegate);
   ScopedCaptureClient::TestApi(second_capture_controller_.get())
       .SetDelegate(delegate2.get());
 
   std::unique_ptr<aura::Window> w(CreateNormalWindow(1, root_window(), NULL));
   w->SetCapture();
   EXPECT_EQ(w.get(), GetCaptureWindow());
-  EXPECT_EQ(w.get(), GetSecondCaptureWindow());
   EXPECT_TRUE(delegate->HasNativeCapture());
   EXPECT_FALSE(delegate2->HasNativeCapture());
 
   second_host_->window()->AddChild(w.get());
   EXPECT_EQ(w.get(), GetCaptureWindow());
-  EXPECT_EQ(w.get(), GetSecondCaptureWindow());
   EXPECT_TRUE(delegate->HasNativeCapture());
   EXPECT_FALSE(delegate2->HasNativeCapture());
 
   w->ReleaseCapture();
   EXPECT_EQ(nullptr, GetCaptureWindow());
-  EXPECT_EQ(nullptr, GetSecondCaptureWindow());
   EXPECT_FALSE(delegate->HasNativeCapture());
   EXPECT_FALSE(delegate2->HasNativeCapture());
 }
 
 // A delegate that deletes a window on scroll cancel gesture event.
 class GestureEventDeleteWindowOnScrollEnd
     : public aura::test::TestWindowDelegate {
  public:
   GestureEventDeleteWindowOnScrollEnd() {}
 
@@ skipping 51 matching lines @@
   ASSERT_NE(nullptr, capture_client);
   EXPECT_EQ(nullptr, capture_client->GetCaptureWindow());
 
   // Send a mouse click. We no longer hold capture so this should not crash.
   ui::MouseEvent mouse_press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                              base::TimeTicks(), 0, 0);
   DispatchEventUsingWindowDispatcher(&mouse_press);
 }
 
 }  // namespace wm